diff --git a/AUTHORS b/AUTHORS index 802efb7..1b1a036 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,3 +23,4 @@ Holger Weiss Michael Wirtgen Oliver Skibbe Andreas Baumann +Lorenz Kästle diff --git a/ChangeLog b/ChangeLog index 1e3d4bb..ca6cf7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1,22958 @@ -Not a Git repository, so I won't update the ChangeLog. +2022-10-19 Sven Nierlein + + * NP-VERSION-GEN, configure.ac: set release version for 2.3.2 + + * AUTHORS, NEWS, THANKS.in, doc/RELEASING.md: release v2.3.2 + +2021-04-10 Jan Wagner + + * THANKS.in: Updating THANKS.in + + * AUTHORS: Adding Andreas Baumann to AUTHORS + + * NEWS: Draft NEWS + +2022-10-07 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * configure.ac, pkg/solaris/solpkg, plugins-scripts/check_sensors.sh: + Replace egrep with grep -E (#1791) + + Replace egrep with grep -E to avoid the deprecation warnings + +2022-09-19 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_load.c, plugins/t/check_load.t: Display total and scaled + load values if check_load scales the values by number of CPUs (#1778) + + * Renew copyright + + * Display more verbose output, if scaled load values are used + + * Actually use scaled value for determining status and print the fitting perfdata depending on input parameters + + * Add test cases for scaled mode + +2016-12-31 Jan Wagner + + * plugins/check_http.c: check_http: Fix HD6 definition + +2016-11-21 John C. Frickson + + * plugins/check_http.c: I had to make a couple of small changes. + +2016-04-12 Eric Wunderlin + + * plugins/check_http.c: Remove unused code + +2016-04-11 Eric Wunderlin + + * plugins/check_http.c: Added ability to correctly check redirects with + reference format //test.server.com/folder + + Referenced redirect of the format //www.server.com/folder would result + in check_http trying to contact http://hostname:80//www.server.com/folder + instead of http://www.server.com/folder. Referenced redirect of this format + is listed in rfc3986 ( https://tools.ietf.org/html/rfc3986 ). It should + work as expected now. + +2022-09-14 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_ntp.c: Check ntp remove unused variables (#1781) + + * Remove unused argument + + * Fix typo in comment + +2022-09-11 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_disk.c: Check disk compiler warnings (#1758) + + * Use unused variable + + * Proper format strings for printf + + * Use proper functions for absolute values + + * Remove and add comments at some places + + * plugins/check_load.c: Check load compiler warnings (#1759) + + * Fix compiler warnings due to implizit conversion and formats + + * Make includes more specific and complement them + + * Formatting fixes + + * plugins/check_swap.c: Check swap compiler warnings (#1756) + + * Fix compiler warnings + + * Fix superfluous whitespaces + +2022-07-25 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_swap.c: check_swap: Fix unit for total in perfdata + (#1779) + + * check_swap: Fix unit for total in perfdata + + * Remove trailing whitespaces + +2022-07-25 Sven Nierlein + + * plugins/check_swap.c: fix parsing swap values (#1780) + + tmp_KB changed from float to uint64, so change the sscanf format accordingly. + +2022-07-24 adrb + + * plugins/check_snmp.c: check_snmp: Segfault if number of processed + lines is greater than number of thresholds + + Segfault at line 489 if number of processed lines is greater than number (#1589) of thresholds + + Co-authored-by: Lorenz <12514511+RincewindsHat@users.noreply.github.com> + +2022-07-20 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/t/check_curl.t, plugins/t/check_http.t: Remove check_http and + check_curl test which are somehow always failing (#1777) + + * Remove failing checks for check_http + * Remove failing checks for check_curl + +2022-07-14 eriksejr + + * plugins-root/check_icmp.c: Set msg_namelen to the size of the sockaddr + struct for the appropriate address family and not sockaddr_storage + (#1771) + + Co-authored-by: Erik Sejr + Co-authored-by: Lorenz <12514511+RincewindsHat@users.noreply.github.com> + +2022-07-14 Archie L. Cobbs + + * plugins/check_by_ssh.c: check_by_ssh: Add "-U" flag (#1123). (#1774) + + This causes a 255 exit value from ssh(1), which indicates a connection failure, + to return UNKNOWN instead of CRITICAL; similar to check_nrpe's "-u" flag. + +2022-07-03 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * .github/workflows/codeql-analysis.yml: Update CodeQL and update runner + before installing (#1775) + +2022-06-18 CDMIUB + + * plugins-scripts/check_disk_smb.pl: Cdmiub (#1770) + + * added timout option to check_disk_smb + +2022-04-10 Andreas Baumann + + * plugins/check_curl.c: check_curl: added option + --continue-after-certificate (#1761) + + * plugins/check_http.c: check_http: added option + --continue-after-certificate (#1761) + +2022-03-26 Tobias Fiebig + + * plugins-scripts/check_mailq.pl: remove duplicate W=i/C=i args (#1755) + + Co-authored-by: Tobias Fiebig + +2022-03-17 Claudio Kuenzler + + * plugins-scripts/check_disk_smb.pl: Add configfile feature to + check_disk_smb (#1402) + +2022-03-15 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-root/check_icmp.c, plugins-root/t/check_icmp.t: check_icmp: + buffer offerflow (#1733) + + * Fix different overflows + + * Less includes + + * Add testcases + + * Remove unused variable + + * Remove unused and commented includes + +2022-02-15 Andreas Motl + + * plugins-scripts/check_uptime.pl, plugins-scripts/t/check_uptime.t: + check_uptime: Fix lowercase typo in plugin output + +2022-02-12 Andreas Motl + + * plugins-scripts/check_uptime.pl, plugins-scripts/t/check_uptime.t: + check_uptime: Add option to report uptime in days instead of seconds + + Currently, the plugin output is: + + CRITICAL: Uptime is 38829029 seconds. + + When using the proposed `--days|-d` option, it will be: + + CRITICAL: Uptime is 449 days. + +2022-02-01 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * configure.ac: Use silent automake by default (#1747) + +2022-01-30 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_disk.c: Description for -M was the wrong way around + (#1746) + + Using -M should show the mountpoint instead of the device the + file system originated from. + Seems like this was not the case for a long time and now + the default is to show the mount point. Using `-M` reverts + to showing the (block) device instead. + The usage Description was adjusted with this commit. + + * plugins/check_procs.c: Fix double percentage sign in usage (#1743) + +2021-05-23 Tobias Wiese + + * plugins/sslutils.c, plugins/tests/certs/.gitignore, + plugins/tests/certs/client-cert.pem, plugins/tests/certs/client-key.pem, + plugins/tests/certs/clientca-cert.pem, + plugins/tests/certs/clientca-key.pem, + plugins/tests/certs/clientchain-cert.pem, + plugins/tests/certs/clientchain-key.pem, + plugins/tests/certs/clientintermediate-cert.pem, + plugins/tests/certs/clientintermediate-key.pem, + plugins/tests/certs/expired-cert.pem, + plugins/tests/certs/expired-key.pem, plugins/tests/certs/ext.cnf, + plugins/tests/certs/generate-certs.sh, + plugins/tests/certs/server-cert.pem, plugins/tests/certs/server-key.pem, + plugins/tests/check_curl.t, plugins/tests/check_http.t: sslutils: use + chain from client certificates + + sslutils used to load only the first certificate when it was given a + client certificate file. + + Added tests for check_http to connect to a http server that expects a + client certificate (simple and with chain). + +2021-12-20 ghciv6 + + * plugins-root/check_icmp.c, plugins-root/t/check_icmp.t: - delay + set_source_ip() until address_family is detected + - add a test to check '-s' + +2022-01-27 Andreas Baumann + + * plugins/check_curl.c, plugins/picohttpparser/picohttpparser.c, + plugins/picohttpparser/picohttpparser.h: fixed -ffollow for HTTP/2.0 + (Fixes #1685): added major_version parsing to PicoHTTPParser + +2022-01-29 Andreas Baumann + + * plugins/check_curl.c, plugins/check_http.c: check_http and check_curl: + added --max-redirs=N option (feature #1684) + +2022-01-25 datamuc + + * plugins/check_pgsql.c: add --queryname parameter to check_pgsql + (#1741) + + This is used in the long output instead of the actual query. + So instead of + + OK - 'select stuff from various, tables where some_stuff is null and other_stuff is not null' returned 42 + + one can use --queryname=check_greatest_basket and it will print + + OK - check_greatest_basket returned 42 + + That's nicer for alerting purposes, at least in our use case. + +2022-01-23 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * doc/developer-guidelines.sgml: Point to Icinga Exchange instead of + dead Monitoring Exchange (#1737) + +2022-01-22 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_fping.c: Fixes the positioning of the code and some + other changes + +2022-01-21 Jan Wagner + + * plugins/check_fping.c: Implements 'host-alive' mode (Closes. #1027) + + To reduce the check-duration, it addes a host-alive flag which stops testing + after the first successful reply. + +2022-01-22 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_disk.c: Trivial printf fix and a little bit of code + style (#1695) + + * Fix several warnings (and some downright bugs probably) with formating in check_disk + + Update to master + + * Fix merge error, I forgot the last time + + * Fix indentation + + Co-authored-by: rincewind + +2022-01-22 Mark A. Ziesemer + + * plugins/check_ping.c: Trivial source code formatting only: Use tabs + consistently for source code indentation (whitespace), as per + https://github.com/monitoring-plugins/monitoring-plugins/blob/master/CODING + . (#1424) + + Looks good, thank you very much. + +2022-01-21 Lorenz <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-scripts/check_mailq.pl: Rebase to master (#1731) + +2018-08-27 Ken D + + * plugins/check_snmp.c: Updated int state to human readable + +2017-06-19 Ken D + + * plugins/check_snmp.c: Added option for null zero length string exit + codes + + When using a large distributed network with the same group of checks used against a large number of devices, occationally there are missing cards in a few devices that are present in other devices. Rather than having a large number of unknown results, disable active checking on those large number of result or having to create a unique check configuration for those devices. + + This option allows you to select an OK, WARNING, CRITICAL or UNKNOWN status while still retaining the default behavior when not present. This also allows a for the check to immediately start checks as intended should the hardware be added that the check is looking for. + +2022-01-03 Lorenz Kästle + + * plugins/check_swap.c: Rename tmp variable to get even with master + +2021-04-23 rincewind + + * plugins-scripts/check_sensors.sh: check_sensors.sh: Make shellcheck + happier + +2021-12-20 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-scripts/check_log.sh: Apparently Dash is not Bash, so -v does + not work + +2021-12-02 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-scripts/check_log.sh: Missing oldlog now aborts check_log + + * plugins-scripts/check_mailq.pl: Fix syntax error resulting from + merging + +2021-11-29 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-scripts/check_file_age.pl: Make size parameter a little bit + more intelligible + +2021-11-24 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins-root/check_icmp.c, plugins/check_disk.c, plugins/check_swap.c: + More wrong printf formatting + + * plugins/check_hpjd.c: check_hpjd: Fixing port option + + * plugins-root/check_icmp.c, plugins/check_disk.c, plugins/check_hpjd.c, + plugins/check_swap.c: Fix CodeQL checks + +2021-11-24 PhiBo + + * plugins/check_ups.c: Fix possible overflow in check_ups (Fixes: #1030) + +2021-11-21 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_game.c: Update Url to qstat + +2021-11-19 Linda Guo + + * plugins/check_ldap.c: Allows check_ldap to get password from env + variable + + It's not secure to provide LDAP password through command line option + because other users on the same host can see the password in + 'ps' command output. + + This change allows check_ldap to get password from environment variable. + +2021-04-19 Lorenz Kästle + + * plugins/check_snmp.c: Fix option description authpassword -> + authpasswd + + * plugins/check_snmp.c: Revert "Fixed option description authpassword -> + authpasswd + whitespaces" + + This reverts commit b27e639725f680411aaa78dd9aa59cfff84ad0c5. + + * plugins/check_snmp.c: Fixed option description authpassword -> + authpasswd + whitespaces + +2021-11-19 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_swap.c: Small fix to threshold validation and style + (indentation) fixes + +2021-11-17 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_ping.c: Add thresholds even if value is missing + + * plugins/utils.c: homogenize perfdata function and fix small bug with + missing semicolon + + * plugins/check_ping.c: Show RTA as unknown if it can not be determined + +2021-07-09 rincewind + + * plugins/check_ping.c: Do not show RTA if no connection was possible + +2021-11-17 Sven Nierlein + + * lib/utils_base.c, lib/utils_base.h, plugins/check_snmp.c, + plugins/tests/check_snmp.t: check_snmp: fix performance thresholds when + using multiple oids + + when using check_snmp with multiple oids it simply printed the unparsed content + from -w/-c into the thresholds for each oid. So each oid contained the hole -w + from all oids. + + ./check_snmp ... -o iso.3.6.1.2.1.25.1.3.0,iso.3.6.1.2.1.25.1.5.0 -w '1,2' -c '3,4' + + before: + SNMP ... | HOST-RESOURCES-MIB::hrSystemInitialLoadDevice.0=393216;1,2;3,4 HOST-RESOURCES-MIB::hrSystemNumUsers.0=24;1,2;3,4 + + after: + SNMP ... | HOST-RESOURCES-MIB::hrSystemInitialLoadDevice.0=393216;1;3 HOST-RESOURCES-MIB::hrSystemNumUsers.0=24;2;4 + + This also applies to fixed thresholds since check_snmp translates negative infinities from: '~:-1' to '@-1:~' + +2021-11-15 Aksel Sjögren + + * plugins-root/check_icmp.c: check_icmp: Fix pkt perfdata in check_host + mode + + Add missing "warn" threshold field in "pkt" perfdata output. + Perfdata should be interpreted as; + + 'label'=value[UOM];[warn];[crit];[min];[max] + + With one field missing, the hardcoded min value '0' ended up in the + "crit" field, making applications interpreting the perfdata thining that + critical threshold is always exceeded. + +2021-10-26 Sven Nierlein + + * plugins/tests/check_procs.t, plugins/tests/var/ps-axwo.debian: + check_procs: add test for elapsed time + + * plugins/tests/var/ps_axwo.debian: remove unused test file + +2021-10-25 Sven Nierlein + + * configure.ac, plugins/tests/check_procs.t: check_procs: improve ps + args autodetection + + one of the first ps commands in the configure.ac is `axwo 'stat comm vsz rss user uid pid ppid args'` which + works on most modern linux systems (checked debian 10/11 and centos 7/8). But this test misses the etime + argument. Therefore `check_procs --metric=ELAPSED` does not work. + + To fix this, we simply do the same test including etime before that one. + + * plugins/check_procs.c: check_procs: remove trailing whitespace + +2021-10-28 Geert Hendrickx + + * plugins/check_smtp.c: check_smtp: add -L flag to support LMTP (LHLO + instead of HELO/EHLO). + +2021-10-27 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_disk.c: Replace tabs with spaces and do some formatting + + * plugins/check_disk.c: Remove whitespace at the end of lines + +2021-10-26 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/utils.c: Fix my own errors for real this time and add some + comments, so I wont do them again + + * plugins/utils.c: Re-add separation semicolons for perfdata, which I + deleted + + * plugins/check_disk.c: Reform some arithmetical operations for more + clarity + + * plugins/check_disk.c: hopefully fix warning high tide with percentage + + * plugins/t/check_disk.t: Fix some tests + +2021-10-25 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/utils.c: Remove useless lines and fix some formatting + + * lib/utils_disk.h, plugins/check_disk.c: Switch to uint64_t + + * plugins/check_disk.c: Reformat a little bit for easier reading + + * plugins/check_disk.c: Recognice IEC binary units and format + accordingly to base2 (always) + +2021-07-05 Harald Jenny + + * plugins/t/check_load.t: Update check_load.t + + adjust tests for new plugin output + + * plugins/check_load.c: Create check_load.c + + just a cosmetic fix so the load plugin display a LOAD prefix before check results + +2021-10-25 Sven Nierlein + + * .github/workflows/test.yml: actions: map utmp from host to container + + this fixes the check_users not having any logged in user to check. + +2021-10-18 Lorenz Kästle + + * plugins-scripts/check_ircd.pl: Add comment to make the purpose of the + nickname fix more obvious + + * plugins-scripts/check_ircd.pl: Restrict the nickname length of the + test user for check_ircd + + check_ircd was using the string `ircd` plus the PID as a nickname + for connecting to a IRC network by default. + This caused errors, when the PID was too high and the network + restricted the length of the nickname to 9 characters. + This patch "fixes" this by just cutting it of, if it gets too big. + +2021-10-02 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_swap.c, plugins/utils.c, plugins/utils.h: Revert to poor + man's logic + + * plugins/check_swap.c: Change all to comments to old comment style + +2021-09-26 RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> + + * plugins/check_swap.c: Fix comparing logic + + * plugins/t/check_swap.t: Remove spaces from tests + +2021-09-25 rincewind + + * plugins/check_swap.c: check_swap: Fix perfdata und thresholds for big + values and simplify code + + The original problem was https://github.com/monitoring-plugins/monitoring-plugins/pull/1705 + where the performance data output of check_swap did not conform to + the parser logic of a monitoring system (which decided to go for + "correct" SI or IEC units. + The PR was accompanied by a change to byte values in the performance + data which broke the _perfdata_ helper function which could not handle + values of this size. + The fix for this, was to use _fperfdata_ which could, but would + use float values. + + I didn't like that (since all values here are discreet) and this + is my proposal for a fix for the problem. + + It introduces some helper functions which do now explicitely work + with (u)int64_t, including a special version of the _perfdata_ helper. + + In the process of introducing this to check_swap, I stumbled over + several sections of the check_swap code which I found problematic. + Therefore I tried to simplify the code and make it more readable + and less redundant. + + I am kinda sorry about this, but sincerely hope my changes can + be helpful. + + * plugins/utils.c, plugins/utils.h: Introduce new perfdata functions and + stuff for using (u)int64_t + +2021-05-24 Jonny007-MKD + + * plugins/check_dns.c, plugins/t/check_dns.t: Improvements suggested by + tobiaswiese + +2020-02-23 Jonny007-MKD + + * plugins/check_dns.c: check_dns: Fix memory leak + + * NEWS, plugins/check_dns.c, plugins/t/check_dns.t: check_dns: add + --expect-nxdomain + +2021-09-01 rincewind + + * .github/prepare_debian.sh: Use netcat-openbsd for debian explicitely + +2021-07-25 Andreas Baumann + + * plugins/check_curl.c: check_curl: fixed a potential buffer overflow in + retir/uri_string + + * plugins/check_curl.c: check_curl: fixed DNS caching for SSL hostnames + (avoid CURLOPT_RESOLVE entry errors) + +2021-07-22 Peter Newman + + * plugins-scripts/check_ifoperstatus.pl: Re-attach a comment to where it + actually belongs + +2021-07-05 rincewind + + * plugins-scripts/check_log.sh: Add quoting for the remaining variables + +2021-07-04 Andreas Baumann + + * plugins/check_curl.c: check_curl: changed to STATE_CRITICAL for + infinite loops (-ffollow) + +2021-07-02 rincewind + + * plugins-scripts/check_log.sh: Add -a option to print all matching + lines and -p and -e options for perl and extended RE + + * plugins-scripts/check_log.sh: Add extended and perl regex + + * plugins-scripts/check_log.sh: Apply shellcheck + + * plugins-scripts/check_log.sh: Remove modified note, since this is a + git repository + +2021-06-25 Lorenz Kästle + + * plugins/check_by_ssh.c: Let ssh decide if a host is valid, enables + usage of ssh .config file + +2021-06-24 Andreas Baumann + + * plugins/check_curl.c: fix for missing X509_up_ref on old systems with + only OpenSSL 1.0 + +2021-06-24 Daniel Uhlmann + + * plugins/check_http.c: changed 'STATE_CRITICAL' to 'STATE_WARNING' for + infinite loop + +2021-06-24 Andreas Baumann + + * plugins/check_curl.c: added option --enable-automatic-decompression + +2021-05-27 Andreas Baumann + + * plugins/check_curl.c: check_curl: + - added verbose output in verify_callback + - pin refcounting for certs (avoid subject extraction error when checking + certs in is_openssl_callback mode) + +2021-05-24 Barak Shohat + + * plugins/check_curl.c, plugins/t/check_curl.t: check_curl.c: bugfix: + verify certificates option should not force SSL to be used + +2021-05-20 Sven Nierlein + + * plugins/tests/check_http.t: tests: ignore sigpipes in https test + daemon + + check_http closes the connection after checking the certificate with -C. This leads to sigpipe + errors when the ssl daemon wants to send a response and the daemon quits which makes the + subsequent tests fail. + + * plugins/tests/check_curl.t, plugins/tests/check_http.t: tests: + increase startup sleep + + github action might fail from to time otherwise + + * .github/prepare_debian.sh, .github/workflows/test.yml: remove useless + comments + +2021-05-19 Jacob Hansen + + * .github/workflows/test.yml: Prune container and volumes + + Rather than manully removing the tmpfs volume. + + * plugins/t/check_fping.t: Refactor check_fping + + * Set correct amount of tests based on conditionals. + * When running the test as non-root, we would previously check is the + setuid bit is set. This doesn't seem to be needed, so just check if the + binary is executable for the user running the test. + * Use cmp_ok to check if tests succeeds rather than couting. + + * .github/workflows/test.yml: Disable IPv6 in tests + + Docker doesn't seem to have a working IPv6 stack by default. For now + disable IPv6 tests. + +2021-05-18 Jacob Hansen + + * plugins/t/check_curl.t: check_curl.t: Adjust test to use -f curl + + It appears that `-f follow` doesn't work correctly in `check_curl` at + the moment. Test adjusted to use `-f curl` instead. + + Issue for the above created: https://github.com/monitoring-plugins/monitoring-plugins/issues/1685 + +2021-04-30 Jacob Hansen + + * .github/prepare_debian.sh: Use openssl generated cert + + The SSL certificate generate using make-ssl-cert seems to not work well + with a our plugins. Causing a "CN could not be found" error to be shown. + + Using an OpenSSL generated certifiticate, seems to work better. + +2021-04-29 Aksel Sjögren + + * plugins-root/t/check_dhcp.t: Fix check_dhcp tests + + * try to use "/usr/sbin/ip" before "ifconfig" since the latter is + obsolete on Linux to figure out interface to listen for DHCP messages. + But keeping ifconfig method just in case. + Without this, tests fail on boxes without ifconfig AND the correct + interface named ethX. + + * amend possible failure responses, as check_dhcp might get a DHCPOFFER, + but from an unexpected address - which happens if the box running + tests are on a network with a DHCP server. + + * plugins-root/Makefile.am: Add test-debug for plugins-root + + Fixes "No rule to make target 'test-debug'" when running "make + test-debug" in root dir. + +2021-04-28 Aksel Sjögren + + * plugins/t/check_curl.t, plugins/t/check_http.t: Fix conditional tests + for check_http, check_curl + + Set correct number of tests in skip- blocks to avoid the error "Bad + plan. You planned 50 tests but ran 55" when run with/without + /usr/bin/faketime and NP_INTERNET_ACCESS=yes/no. + +2021-04-30 Jacob Hansen + + * .github/prepare_debian.sh: Attempt to fix check_users + +2021-04-13 Sven Nierlein + + * .github/NPTest.cache, .github/prepare_debian.sh, + .github/workflows/test.yml, .travis.yml: migrate travis ci to github + actions + +2021-04-12 Sven Nierlein + + * plugins/t/check_fping.t: fix fping test + + in case of dns errors, fping returns an unknown and thats ok. + +2021-04-28 PhiBo + + * .github/workflows/codeql-analysis.yml: Add CodeQL checks + + Add initial github actions to perform CodeQL securtiy checks + +2021-04-12 Barak Shohat + + * plugins/check_curl.c: check_curl: Fix bug where headers beginning with + HTTP_ cause the status line parsing to fail. + +2021-04-08 Andreas Baumann + + * plugins/check_curl.c: check_curl: backported --show-body/-B to print + body (from check_http) + + * plugins/check_curl.c: check_curl: make -C obvious (from check_http, + part 2) + + * plugins/check_curl.c: check_curl: make -C obvious (from check_http) + + * plugins/check_curl.c: check_curl: Increase regexp limit (to 1024 as in + check_http) + +2021-04-07 Barak Shohat + + * plugins/check_curl.c, plugins/t/check_curl.t: Add an option to + check_curl to verify the peer certificate & host using the system CA's + +2021-04-06 Barak Shohat + + * plugins/check_curl.c, plugins/t/check_curl.t: Updated check_curl.c to + display a specific human-readable error message where possible + +2021-03-11 Sven Nierlein + + * plugins/check_curl.c, plugins/tests/check_curl.t: fix check_curl crash + if http header contains leading spaces + + check_curl crashes when a (broken) http server returns invalid http header with + leading spaces or double colons. This PR adds a fix and a test case for this. + +2021-03-08 Andreas Baumann + + * plugins/check_curl.c: check_curl: added string_statuscode function for + printing HTTP/1.1 and HTTP/2 correctly + +2021-02-15 Florian Lohoff + + * plugins/check_pgsql.c: Using snprintf which honors the buffers size + and guarantees null termination. (Closes: #1601) + + As strcpy may overflow the resulting buffer: + + flo@p5:~$ /tmp/f/usr/lib/nagios/plugins/check_pgsql -d "$(seq 1 10000)" + *** buffer overflow detected ***: terminated + Aborted + + I would propose to change the code rather like this, using snprintf + which honors the buffers size and guarantees null termination. + +2021-01-19 Andreas Baumann + + * plugins/check_curl.c: check_curl: fixed a potential buffer overflow in + url buffer + + * plugins/check_curl.c: check_curl: fixed help, usage and errors for TLS + 1.3 + +2021-01-03 Wolfgang Karall-Ahlborn + + * plugins/tests/check_procs.t: check_procs -- update test data too + + * plugins/check_procs.c: check_procs -- exchange needle and haystack in + strstr() for proper state match + +2020-12-19 Tim Gates + + * plugins-root/check_icmp.c: docs: fix simple typo, conspicuosly -> + conspicuously + + There is a small typo in plugins-root/check_icmp.c. + + Should read `conspicuously` rather than `conspicuosly`. + +2020-12-09 Jan Wagner + + * doc/RELEASING.md: Prepare the release docu for 2024 when we release + 2.4 + + * NEWS: New version in NEWS + + * NP-VERSION-GEN, configure.ac: New version number for git + + * NEWS: Draft NEWS + + * THANKS.in: Updating contributors + + * NP-VERSION-GEN, configure.ac: Updating version number + +2020-12-08 Sven Nierlein + + * plugins-scripts/check_mailq.pl: check_mailq: restore accidentially + removed options + + with https://github.com/monitoring-plugins/monitoring-plugins/issues/381 -W and -C have been removed. It + would have been sufficient to only remove the long options. Restoring short options.. + + - fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954961 + +2020-11-02 Rolf Eike Beer + + * plugins/check_dns.c: check_dns: split multiple IP addresses passed in + one -a argument + +2020-10-02 Prathamesh Bhanuse <72161308+Prathu121@users.noreply.github.com> + + * README: Update README + +2020-09-15 ghciv6 + + * plugins/check_mysql_query.c: - fix for issue #1562 + 1st compare then free up resources + +2020-08-18 mdavranche + + * plugins/check_swap.c: check_swap: Handle cached swap + +2020-05-20 ghciv6 + + * plugins/check_dns.c: detect unreachable dns service in nslookup output + (from bind-utils-9.8.2) + prevent core if error_scan detects an error in a line without ':' + +2020-05-18 Sven Nierlein + + * plugins/check_curl.c: check_curl: host_name may be null + + for example when using like: ./check_curl localhost + + * plugins/t/check_curl.t: update test parameter according to check_http + + * plugins/check_curl.c: check_curl: use CURLOPT_RESOLVE to fix + connecting to the right ip + + when using ssl, the composed url contains the hostname instead of the specified + ip. So use CURLOPT_RESOLVE to make curl still connect to the ip. + + * plugins/check_curl.c: check_curl: clean trailing whitespace + +2020-05-15 Sven Nierlein + + * plugins/tests/check_curl.t: merge test changes from check_http + + the example certificate has changed since. + + * plugins/tests/certs/expired-cert.pem, + plugins/tests/certs/expired-key.pem, plugins/tests/check_http.t: tests: + update expired test certificate + + the certificate used to test expired http checks is to old to be used + with recent ssl libraries and results in: + + > SSL routines:SSL_CTX_use_certificate:ee key too small + + unfortunatly the error is only visible when setting $IO::Socket::SSL::DEBUG in + the check_http.t file. + + * plugins/tests/certs/expired-cert.pem, + plugins/tests/certs/expired-key.pem, plugins/tests/check_http.t: tests: + update expired test certificate + + the certificate used to test expired http checks is to old to be used + with recent ssl libraries and results in: + + > SSL routines:SSL_CTX_use_certificate:ee key too small + + unfortunatly the error is only visible when setting $IO::Socket::SSL::DEBUG in + the check_http.t file. + +2020-04-13 ghciv6 + + * configure.ac: - workaround for issue #1550 + - better use "ping -4" instead of "ping" if supported + +2020-01-30 DaTa + + * doc/developer-guidelines.sgml: Revert "simplify documentation" + + This reverts commit 7693af147926d0eb7369a43070d114b6bd79dc70. + + Now it is wrong: + + After reading + + https://www.naemon.org/documentation/usersguide/pluginapi.html#plugin_output_spec + + the old wording makes more sense. + +2017-07-19 Vadim Zhukov + + * plugins-root/check_dhcp.c: Use size_t instead of int when calling + sysctl(3). + + Otherwise, it writes sizeof(size_t) bytes to &oldlen, smashing the stack. + +2020-01-07 Alexander A. Klimov + + * plugins/check_tcp.c: check_tcp: add --sni + +2019-12-25 Christian Tacke <8560110+ChristianTacke@users.noreply.github.com> + + * plugins/popen.c, plugins/popen.h: Fix timeout_interval declarations + + There are different declarations for timeout_interval: + + lib/utils_base.c has the definition: + unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT; + lib/utils_base.h has the appropiate declaration: + extern unsigned int timeout_interval; + + plugins/popen.h has an extra declaration: + extern unsigned int timeout_interval; + This doesn't hurt, but it's a dupe. The one in utils_base.h + should be enough, so remove this one. + + plugins/popen.c has a WRONG one: + extern int timeout_interval; + Remove it! + Use #include "utils.h" to get the right one. + This makes the local defines for max/min unnecassary, so + remove them also. + +2019-12-29 Andreas Baumann + + * plugins/check_curl.c: increased copyright + +2019-11-28 datamuc + + * doc/developer-guidelines.sgml: simplify documentation + + "first" + "second to last" is every line right? + +2019-11-07 Andreas Baumann + + * plugins/check_curl.c: check_curl: NSS, parse more date formats from + certificate (in -C cert check) + + * plugins/check_curl.c: check_curl: more tolerant CN= parsing when + checking certificates (hit on Centos 8) + +2019-10-11 Andreas Baumann + + * plugins/check_curl.c: setting no_body to TRUE when we have a HEAD + request + +2019-09-07 Andreas Baumann + + * plugins/check_curl.c: some LIBCURL_VERSION checks around HTTP/2 + feature + + * plugins/check_curl.c: added --http-version option to check_curl to + choose HTTP version + + * plugins/check_curl.c: improved curlhelp_parse_statusline to handle + both HTTP/1.x and HTTP/2 + + * plugins/picohttpparser/picohttpparser.c, + plugins/picohttpparser/picohttpparser.h: check_curl: updates embedded + picohttpparser to newest git version + + * REQUIREMENTS: fixed whitespaces in REQUIREMENTS for check_curl to fit + the rest of the requrirements + + * plugins/check_curl.c: setting progname of check_curl plugin to + check_curl (at least for now) + + * configure.ac: remove obsolete AM_CONDITIONAL([WITH_CHECK_CURL]) + +2019-08-12 tonvoon + + * nagiosplug_mariadbclient.patch: Delete nagiosplug_mariadbclient.patch + +2019-08-02 Ton Voon + + * m4/np_mysqlclient.m4, nagiosplug_mariadbclient.patch: Allow + mariadbclient to be used for check_mysql + +2019-04-25 Sven Nierlein + + * plugins/popen.c, plugins/runcmd.c, plugins/utils.c, plugins/utils.h: + fix maxfd being zero + + If _SC_OPEN_MAX is available then maxfd was zero initialized and never set to the value from sysconf. + This leads to segfaults with free(): invalid size introduced by commit 7cafb0e84550035fe671662c293122be975065ca. + +2019-04-09 Christopher Odenbach + + * plugins/check_disk.c: include -P switch in help + +2019-03-21 ChrisWi + + * plugins/check_procs.c: improve command examples for 'at least' + processes + +2013-05-10 Robin Sonefors + + * plugins/check_mysql.c: check_mysql: Allow sockets to be specified to + -H + + The help text says that -H accepts a "unix socket (must be an absolute + path)". Now that actually corresponds to reality. + +2019-02-19 Sven Nierlein + + * plugins/tests/certs/server-cert.pem, + plugins/tests/certs/server-key.pem, plugins/tests/check_http.t: renew + test certificates + +2019-02-15 Rolf Eike Beer + + * plugins/check_dns.c: check_dns: fix typo in parameter description + +2019-02-15 Sven Nierlein + + * lib/utils_base.c, lib/utils_base.h, lib/utils_cmd.c, lib/utils_cmd.h, + plugins/check_dbi.c, plugins/check_pgsql.c, plugins/common.h, + plugins/popen.c, plugins/runcmd.c, plugins/utils.c, plugins/utils.h: + check_by_ssh: fix child process leak on timeouts + + When check_by_ssh runs into a timeout it simply exits keeping all child processes running. + Simply adopting the kill loop from runcmd_timeout_alarm_handler() fixes this. + +2019-02-12 Tobias Wolf + + * plugins/check_http.c: Also support the --show-body/-B flag when + --expect is used + +2019-02-04 Jan Wagner + + * .travis.yml, plugins/t/NPTest.cache.travis: travis-ci: Use RSA keys + for SSH tests + +2019-02-02 Jan Wagner + + * .travis.yml: travis-ci: Restart mysql + + * .travis.yml: travis-ci: The package name is now 'squid' + + * .travis.yml: travis-ci: Remove backports ppa + + * .travis.yml: travis-ci: Switch over to xenial + +2019-01-21 Sven Nierlein + + * plugins/tests/check_snmp.t: tests: make check_snmp test more reliable + + The check_snmp rate tests depend on the exact amount of time spend between the + plugin runs and will fail on busy machines, ex. the ci servers. Using faketime + mitigates this issue and also removes all the sleeps. + +2019-01-18 Iustin Pop + + * plugins/check_smtp.c: Simply initializes n before it is used + + When SSL is enabled, n is assigned the size of the server's second EHLO + response (I think in bytes), which will usually be significantly higher + than the command passed. As such, no commands are executed and no responses + are checked, which - silently - defeats the desired checks and results in a + success value. + +2010-09-07 Kostyantyn Hushchyn + + * plugins/check_hpjd.c: check_hpjd: Added -D option to disable warning + on 'out of paper' + +2018-12-10 Jacob Hansen + + * plugins-root/check_icmp.c: check_icmp: Do not overwrite -4,-6 on + lookup + + In case we needed to do a lookup, we previously overwrote the + address_family to IPv6, even if we supplied -4 as a cmd line argument. + + This commit should ensure the cmd line argument is always followed. + + * plugins-root/check_icmp.c: check_icmp: emit error if multiple protocol + version + + As we do not support checking both IPv4 and IPv6 hosts in one execution + we emit an error if multiple protocol versions are defined in the cmd + line args. + + * plugins-root/check_icmp.c: check_icmp: move opts string into a + variable + + This commit moves the opts string into a variable as it is now used + twice. + +2018-12-08 Vincent Danjean + + * gl/fsusage.c, gl/fsusage.h, lib/utils_disk.c, lib/utils_disk.h, + plugins/check_disk.c: [check_disk] add support to display inodes usage + in perfdata + + This is not enabled by default + It can be enabled with the -P (--iperfdata) option + +2018-12-06 Jacob Hansen + + * plugins-root/check_icmp.c: check_icmp: Correctly set address_family on + lookup + + If a hostname is supplied instead of an IP address, the automatic + address family detection would fail to correctly set the IP protocol + version (it would always be IPv6). + + We now supply AF_UNSPEC to getaddrinfo, which should then return the + correct address family in the result. + +2018-12-03 Jacob Hansen + + * plugins-root/check_icmp.c: check_icmp: removed outcommented code + + * plugins-root/check_icmp.c: check_icmp: process protocol version args + first + + Detection of protocol version is in the previous patch implemented in + the add_target() function, which is called when adding the -H command + line argument. That means that if a protocal version argument (-4, -6) + is added after the -H then the protocol version might be incorrectly + set. + + This patch ensures that we first process the protocol version arguments, + and then we process the rest of the arguments. + +2018-11-29 Jacob Hansen + + * plugins-root/check_icmp.c: check_icmp: Automatically detect IP + protocol + + This patch automatically detects whether the protocol version is IPv4 or + IPv6 + + All credits to: https://github.com/ghciv6 + +2015-10-22 Lars Michelsen + + * plugins-root/check_icmp.c: Fixed parameter handling after + 01efbb2183d49c5082598d4799788fc385342f28 + +2015-10-13 Lars Michelsen + + * plugins-root/check_icmp.c: check_icmp: Add IPv6 support + + This commit adds IPv6 capabilities to check_icmp. It is now possible to + specify the address family using the arguments -4 (default) or -6. + + To make the change possible we had to move the argument parsing previous + to creating the socket to be able to create it with the correct address + family. + + This commit also fixes some gcc 4.9.2 compiler warnings. It has been + tested with several current linux distributions (debian, ubuntu, rh, + sles). + + This commit fixes monitoring-plugins/monitoring-plugins#1291 + +2018-12-05 Tomas Mozes + + * plugins/check_http.c: plugins: check_http: Increase regexp limit + +2018-12-04 Sven Nierlein + + * .travis.yml, NPTest.pm, plugins/t/NPTest.cache.travis, + plugins/t/check_by_ssh.t, plugins/t/check_fping.t, + plugins/t/check_ftp.t, plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_jabber.t, plugins/t/check_ldap.t, + plugins/t/check_mysql.t, plugins/t/check_mysql_query.t, + plugins/t/check_snmp.t, plugins/t/check_ssh.t, plugins/t/check_tcp.t, + plugins/t/check_time.t: tests: rework test parameters + + there were 2 variants of calling getTestParameter: + + - parameter, description, default value + - parameter, env value, default value, description, scope + + While scope was never actually used and having 2 names for the same value led + to having 2 different entries in the cache file for the same configuration. + + This commit removes the variants and simplifies tests parameters by only using + the first 3 parameter variant. + +2018-12-04 Sven Nierlein + + * NPTest.pm: NPTest: unify whitespace + +2018-12-04 Sven Nierlein + + * plugins-scripts/t/check_file_age.t: tests: skip some tests if + Monitoring::Plugin::Range isn't available + + The check_file_age uses Monitoring::Plugin::Range internally. Skip thoses tests + if the module isn't available. + +2018-12-04 Sven Nierlein + + * Makefile.am: tests: enable plugins-root tests + +2010-12-14 Kostyantyn Hushchyn + + * plugins/check_cluster.c: check_cluster.c: Added data argument + validation. + +2018-11-12 Andreas Baumann + + * plugins/check_curl.c: set hostname in for CURLOPT_CURL to virtual + hostname in case of SSL (for SNI to work) + +2018-11-09 Tobias Wolf + + * plugins/check_http.c: Add new flag --show-body/-B to print body + + This should help with figuring out ia problem at a glance when enabled for + healthz endpoints on web APIs, for example. + + The content of the body can point to what the problem is and help with + diagnostics. + + Fixes #1559 + +2018-11-06 Markus Frosch + + * .travis.yml, plugins/t/NPTest.cache.travis, plugins/t/check_http.t, + tools/squid.conf: test: Add proxy tests via proxy + + On Travis with a local squid + +2018-10-31 Markus Frosch + + * plugins/check_http.c: Allow user to specify HTTP method after proxy + CONNECT + + Simple format, avoids refactoring the CONNECT feature. + +2018-10-29 Sven Nierlein + + * plugins/check_curl.c: check_curl: code cleanup + + CURLOPT_RESOLVE is not required, since we do not verify certificates in any way. + +2018-10-25 Sven Nierlein + + * plugins/check_curl.c, plugins/t/check_curl.t: check_curl: rewrite + connect_to / host headers + + since CURLOPT_CONNECT_TO is only available in later curl versions, we do it the other way round now and + set the url from the address we want to connect to and then set the host header accordingly. + +2018-10-24 Sven Nierlein + + * plugins/check_curl.c: check_curl: code cleanup + + * plugins/check_curl.c: check_curl: handle supplied port correctly + + if a port was given by -p, it should not be overruled by the port extracted from -H. + + * .travis.yml, configure.ac: check_curl: fix builds if curl is not + enabled + + * .travis.yml: travis: --enable-check-curl is no longer required + + * .gitignore: cleanup gitignore + + these files have been removed meanwhile + + * configure.ac, plugins/Makefile.am: builds: alway put picohttpparser + into the dist tarball + + substituting PICOHTTPPARSER_DIR only when curl gets build, leads + to different dist tarballs depending on wether libcurl was available + or not. This then breaks later builds from this tarball because of + the missing files. + + * configure.ac: check_curl: do not build check_curl if curllibs are + missing + +2018-10-23 Sven Nierlein + + * m4/uriparser.m4: uriparser: do not reset flags if already set + + * plugins/picohttpparser/Makefile.am: picohttpparser: add header to + final tarball + + * m4/uriparser.m4: check_curl: do not use pkg-config if --with-uriparser + was supplied by commandline + + if we run configure with --with-uriparser=... it should use that path or fail. + + * configure.ac: check_curl: enable by default if all requirements are + met + +2018-10-22 Sven Nierlein + + * plugins/check_curl.c: check_curl: unify performance data + + and align them with check_http + + * plugins/check_curl.c: check_curl: use same page length in performance + data and text output + +2018-06-29 Christopher Odenbach + + * plugins/tests/check_curl.t: added some advanced tests for check_curl + +2018-06-12 Christopher Odenbach + + * plugins/check_curl.c: Modified virtual host and port behaviour to + match check_http. + +2018-06-08 Andreas Baumann + + * plugins/check_curl.c: check_curl: changed name of plugin in user-agent + and added curl_version() to it + +2018-06-03 Andreas Baumann + + * plugins/check_curl.c: check_curl: removed some dead code + +2018-06-02 Andreas Baumann + + * plugins/check_curl.c: check_curl: removed die in redirect with + relative paths, simple cases (same protocol, same host) actually work + + * plugins/check_curl.c: ..I should really not test in test code :-) + + * REQUIREMENTS, plugins/check_curl.c: check_curl: made HTTP message + optional + +2018-06-01 Andreas Baumann + + * m4/uriparser.m4: check-curl: have some fallbacks ready if pkg-config + is missing for uriparser tests + +2018-06-01 Jean-François Rameau + + * plugins/check_curl.c: Avoid working with free'ed memory + +2018-06-01 Andreas Baumann + + * plugins/check_curl.c: fixed typo in check_curl error message + (unparsable) + + * ACKNOWLEDGEMENTS, REQUIREMENTS, configure.ac, m4/uriparser.m4, + plugins/Makefile.am, plugins/uriparser/Makefile.am, + plugins/uriparser/Uri.h, plugins/uriparser/UriBase.h, + plugins/uriparser/UriCommon.c, plugins/uriparser/UriCommon.h, + plugins/uriparser/UriCompare.c, plugins/uriparser/UriDefsAnsi.h, + plugins/uriparser/UriDefsConfig.h, plugins/uriparser/UriDefsUnicode.h, + plugins/uriparser/UriEscape.c, plugins/uriparser/UriFile.c, + plugins/uriparser/UriIp4.c, plugins/uriparser/UriIp4.h, + plugins/uriparser/UriIp4Base.c, plugins/uriparser/UriIp4Base.h, + plugins/uriparser/UriNormalize.c, plugins/uriparser/UriNormalizeBase.c, + plugins/uriparser/UriNormalizeBase.h, plugins/uriparser/UriParse.c, + plugins/uriparser/UriParseBase.c, plugins/uriparser/UriParseBase.h, + plugins/uriparser/UriQuery.c, plugins/uriparser/UriRecompose.c, + plugins/uriparser/UriResolve.c, plugins/uriparser/UriShorten.c: removed + embedded uriparser library, added --with-uriparser configure option + to use uriparser library from the system + + * plugins/check_curl.c: bumped coyright to 2018 in check_curl.c + +2018-05-31 Andreas Baumann + + * ACKNOWLEDGEMENTS, plugins/uriparser/Uri.h, + plugins/uriparser/UriBase.h, plugins/uriparser/UriCommon.c, + plugins/uriparser/UriCompare.c, plugins/uriparser/UriDefsAnsi.h, + plugins/uriparser/UriDefsConfig.h, plugins/uriparser/UriDefsUnicode.h, + plugins/uriparser/UriEscape.c, plugins/uriparser/UriFile.c, + plugins/uriparser/UriIp4.c, plugins/uriparser/UriIp4.h, + plugins/uriparser/UriIp4Base.c, plugins/uriparser/UriNormalize.c, + plugins/uriparser/UriNormalizeBase.c, plugins/uriparser/UriParse.c, + plugins/uriparser/UriParseBase.c, plugins/uriparser/UriQuery.c, + plugins/uriparser/UriRecompose.c, plugins/uriparser/UriResolve.c, + plugins/uriparser/UriShorten.c: updated bundled version of uriparser to + 0.8.5 + + * plugins/check_curl.c: fixed initialization of server_url (freeing + non-pointer in case of redirects) + +2018-05-28 Sven Nierlein + + * plugins/check_curl.c: check_curl: cleanup + + - remove obsolete todos + - change exit code to unknown if regex exectute fails + +2017-11-02 Andreas Baumann + + * plugins/check_curl.c: set ssl_version to CURL_SSLVERSION_DEFAULT and + not CURL_SSLVERSION_TLSv1_0 + (since curl 7.56.1 we get an illegal argument error otherwise) + +2017-05-31 Andreas Baumann + + * plugins/check_curl.c: added -b to print_usage + +2017-05-28 Sven Nierlein + + * plugins/check_curl.c: check_curl: add proxy auth option + + * plugins/check_curl.c: check_curl: update docs + + * plugins/check_curl.c: check_curl: add legacy http request support + + * plugins/check_curl.c: check_curl: add docs about https proxy + + * plugins/check_curl.c: check_curl: clean whitespace + + * plugins/check_curl.c: check_curl: handle proxied https requests + +2017-05-07 Andreas Baumann + + * .travis.yml, plugins/check_curl.c: fixed some printf bugs and switched + to libcurl4-openssl for Travis tests + + * REQUIREMENTS: added check_curl to REQUIREMENTS + +2017-05-06 Andreas Baumann + + * plugins/uriparser/Makefile.am: fixed include flags for liburiparser + + * .travis.yml: added check|_curl enabler in right position in configure + in Travis script + + * .travis.yml, configure.ac, plugins/check_curl.c: fixed redirect sticky + port handling in redir + + * .gitignore, ACKNOWLEDGEMENTS, configure.ac, plugins/Makefile.am, + plugins/check_curl.c, plugins/picohttpparser/Makefile.am, + plugins/picohttpparser/picohttpparser.c, + plugins/picohttpparser/picohttpparser.h, plugins/uriparser/Makefile.am, + plugins/uriparser/Uri.h, plugins/uriparser/UriBase.h, + plugins/uriparser/UriCommon.c, plugins/uriparser/UriCommon.h, + plugins/uriparser/UriCompare.c, plugins/uriparser/UriDefsAnsi.h, + plugins/uriparser/UriDefsConfig.h, plugins/uriparser/UriDefsUnicode.h, + plugins/uriparser/UriEscape.c, plugins/uriparser/UriFile.c, + plugins/uriparser/UriIp4.c, plugins/uriparser/UriIp4.h, + plugins/uriparser/UriIp4Base.c, plugins/uriparser/UriIp4Base.h, + plugins/uriparser/UriNormalize.c, plugins/uriparser/UriNormalizeBase.c, + plugins/uriparser/UriNormalizeBase.h, plugins/uriparser/UriParse.c, + plugins/uriparser/UriParseBase.c, plugins/uriparser/UriParseBase.h, + plugins/uriparser/UriQuery.c, plugins/uriparser/UriRecompose.c, + plugins/uriparser/UriResolve.c, plugins/uriparser/UriShorten.c: some + rework: + - added old style 'redir' function and options along to a new + libcurl internal 'follow' parameter 'curl' + - moved picohttpparser to it's own subdirectory + - added uriparser to be used instead of the home-grown parser in + 'redir' + +2017-05-05 Andreas Baumann + + * plugins/tests/check_curl.t: synched tests/check_http.t test changes + (virtualhost) into tests/check_curl.t + +2017-05-04 Andreas Baumann + + * plugins/check_curl.c: fixed failing tests due to wrong content_length + calculation + + * plugins/check_curl.c: fixed getopt (-l missing, wrong order, hard to + compare with check_http.c) + + * plugins/check_curl.c: more tolerant CERTINFO parsing + +2017-04-28 Andreas Baumann + + * plugins/check_curl.c: using CURLOPT_RESOLVE to make sure -I is the IP + we connect to + + * plugins/check_curl.c: changed URL construction again, IP should + preceed hostname, hostname set as Host: (makes sure we get the corrent + DNS entry and server) + +2017-04-27 Andreas Baumann + + * plugins/check_curl.c: page length is computed from header, fallback to + actual body size (get_content_length) + + * plugins/check_curl.c: fixed setting host_name or server_address in + curl URL option + +2017-04-24 Andreas Baumann + + * plugins/check_curl.c: reverted hostname in URL, must use CURL_RESOLVE + mayabe + + * plugins/check_curl.c: must use host_name and not server_address in + URL, CN subject mismatch + +2017-04-21 Andreas Baumann + + * plugins/check_curl.c: disable non-OpenSSL code compilation in -C check + if we have USE_OPENSSL set + + * plugins/check_curl.c: made non-OpenSSL version of certificate -C check + work + + * plugins/check_curl.c: handling the -C check now when compiled with + OpenSSL but libcurl is not compiled with OpenSSL + + * plugins/check_curl.c: preparing for certificate checks (non-OpenSSL + version) + + * plugins/check_curl.c: small cleanup + +2017-04-20 Andreas Baumann + + * plugins/check_curl.c: probing for SSL library used by libcurl and + started improving the certificate check -C + +2017-04-19 Andreas Baumann + + * plugins/check_curl.c: using curl_getdate instead of local + parse_time_string, added verbose debug code for -M + + * plugins/check_curl.c: small fixes and cleanups around SSL, be more + tolerant to -S options + + * plugins/check_curl.c: for now we set LIBCURL_USES_OPENSSL always + + * plugins/check_curl.c: made check_curl compile also if we have openssl + disabled + + * plugins/check_curl.c: fixed some libcurl checks and minimal versions + + * plugins/check_curl.c: some work on certificate checking for + non-OpenSSL libraries + +2017-04-18 Andreas Baumann + + * plugins/check_curl.c, po/de.po: small fix and we see + CURLOPT_SSL_CTX_FUNCTION does not work on Centos 6? + + * plugins/check_curl.c: some cleanup and added error handling around + curl_easy_getinfo/curl_easy_setopt + +2017-04-16 Andreas Baumann + + * plugins/check_curl.c, plugins/tests/check_curl.t: fixed test outputs + for status line checks + handling empty data in POST and PUT + handling data upload (from -P ) also in PUT + +2017-04-15 Andreas Baumann + + * plugins/check_curl.c: added -n and more display_html stuff + + * plugins/check_curl.c: added -L option + + * plugins/check_curl.c: fixed non-C99-ism in get_header_value + +2017-04-14 Andreas Baumann + + * .gitignore, plugins/Makefile.am, plugins/check_curl.c, + plugins/picohttpparser.c, plugins/picohttpparser.h: added -M age + option for document age, using picohttpparser from h2o (maybe handy + later to make a more robust header condition checker?) + + * plugins/t/check_curl.t, plugins/tests/check_curl.t: made check_curl + tests copies of check_http tests because they will differ slightly + +2017-03-19 Andreas Baumann + + * plugins/check_curl.c: added POST support (-P/-T options) + + * plugins/check_curl.c: fixed handling of SSL/TLS protocol versions + + * plugins/check_curl.c: added -l option, fixed some usage/help + + * plugins/check_curl.c: added -d/--header-string option + +2017-03-18 Sven Nierlein + + * plugins/check_curl.c: check_curl: implement -e/--expect + + * plugins/check_curl.c: check_curl: support check_http arguments for + backwards compatibility + + * plugins/check_curl.c: check_curl: adopt output format from check_http + + * plugins/t/check_curl.t, plugins/t/check_http.t, + plugins/tests/check_curl.t, plugins/tests/check_http.t: check_curl: make + check_curl use the same tests as check_http + +2017-03-17 Andreas Baumann + + * plugins/check_curl.c: added -4/-6 option + + * plugins/check_curl.c: added -m/--pagesize option + + * plugins/check_curl.c: added help for --invert-regex + + * plugins/check_curl.c: added -R/-ereg/-eregi + + * plugins/check_curl.c: added -N/--no-body option + + * plugins/check_curl.c: added usage and help for -E/--extended-perfdata + + * plugins/check_curl.c: reverted double header in longopts + + * plugins/check_curl.c: added help/usage and getopt long struct member + for -k/--header option + + * plugins/check_curl.c: fixed a missing else before curl_easy_setopt + CURLOPT_CUSTOMREQUEST + +2017-03-15 Sven Nierlein + + * plugins/t/check_curl.t: add check_curl test + + just a copy of check_http for now... + + * plugins/check_curl.c: check_curl: set correct host header + +2017-03-14 Sven Nierlein + + * plugins/check_curl.c: check_curl: implement extended performance data + + * plugins/Makefile.am, plugins/check_curl.c, plugins/sslutils.c: + check_curl: implement certificate checks + + * plugins/check_curl.c: check_curl: implement optional http headers + +2017-03-12 Andreas Baumann + + * plugins/check_curl.c: added HTTP method handling + +2017-01-22 Andreas Baumann + + * plugins/check_curl.c: forgot declaration of INVERT_REGEX in getopt + otions + + * plugins/check_curl.c: added some casts for curl write functions + + * plugins/check_curl.c: added -r and --invert-regex + +2017-01-21 Andreas Baumann + + * plugins/check_curl.c: added -ca-file option + + * plugins/check_curl.c: handling last HTTP header correctly in HTTP line + parser (added a strrstr replacement) + +2017-01-20 Andreas Baumann + + * plugins/check_curl.c: some comment cleanup + + * plugins/check_curl.c: adapted to style, using header file shims + instead of HAVE_XXX by hand + +2017-01-19 Andreas Baumann + + * plugins/check_curl.c: fixed curl error message + + * plugins/check_curl.c: added -s option + + * plugins/check_curl.c: added most options from nagios-curl-plugin + +2017-01-13 Andreas Baumann + + * .gitignore, configure.ac, m4/libcurl.m4, plugins/Makefile.am, + plugins/check_curl.c: added autoconf stuff for curl plugin, created + empty plugin + +2018-10-13 Lucas Bussey <> + + * .gitignore: Added a compiled plugin script that was missing from + gitignore + +2018-10-10 Stefan Bethke + + * plugins/check_http.c: Docs check_http: make -C obvious + + You need to read the docs carefully to realize that check_http has two + modes of operation: the regular HTTP checks, and a TLS certificate + check. Only one of these can be run in a single invocation. + + Fixes #1553 + +2018-09-29 Guido Falsi + + * lib/utils_base.c: Avoid passing NULL to vprintf(). + +2018-07-25 Rolf Eike Beer + + * NEWS, plugins/check_dns.c: check_dns: allow forcing complete match of + all addresses + + * NEWS, THANKS.in, plugins/check_dns.c: check_dns: allow returned + addresses to be in any order + + * plugins/check_dns.c: check_dns: simplify loop + +2018-06-17 Bernd Arnold + + * plugins-scripts/check_uptime.pl: Fixed error message, added comment + + * plugins-scripts/check_uptime.pl: Drop uptime binary call + + No need to call /bin/uptime, since the string can be generated with strftime(...). + + * plugins-scripts/check_uptime.pl: Added help text for range support + + * plugins-scripts/check_uptime.pl: Remove useless (empty) print + +2018-06-13 Sven Nierlein + + * plugins-scripts/check_uptime.pl: fix typo in check_uptime + + * plugins-scripts/Makefile.am: add check_uptime to makefile + +2018-06-13 Bernd Arnold + + * plugins-scripts/check_uptime.pl: Refactoring + + Better alignment. + Avoid duplications ("Exceeds ... threshold"). + + * plugins-scripts/t/check_uptime.t: Added tests for range values + + * plugins-scripts/check_uptime.pl, plugins-scripts/t/check_uptime.t: + Introducing ranges for warning and critical + + Works as before: + -w 1w -c 2w + + New (as before, but also warn if uptime < 5m, and crit if uptime < 2m): + -w 5m:1w -c 2m:2w + + (idea by @sni) + + Also refactored the time calculation, if a suffix is present: + New sub calc_as_seconds($) + + * plugins-scripts/check_uptime.pl: Modified alignment + + * plugins-scripts/check_uptime.pl: Fix: Use macro for perl binary + + I've messed that up in the previous commit 554b702f9d65fdfe640f20633543e00cd79d64ac. + +2018-06-09 Bernd Arnold + + * plugins-scripts/check_uptime.pl: Fix: Initialize values + + Otherwise, there's a warning about unitialized values: + Use of uninitialized value $hours in numeric gt (>) at ... + Use of uninitialized value $days in numeric gt (>) at ... + +2018-06-03 Bernd Arnold + + * plugins-scripts/check_uptime.pl: Fix: uptime_file variable was + declared too late + + When called with --help, the following error was shown: + Use of uninitialized value $uptime_file in concatenation (.) or string at + + * plugins-scripts/t/check_uptime.t: Added test file + + * plugins-scripts/check_uptime.pl: Added suffix "s" for seconds in + perfdata output + + * plugins-scripts/check_uptime.pl: Rename to .pl + + All other check script also have the .pl ending + +2018-05-30 Bernd Arnold + + * plugins-scripts/check_uptime: Replaced my values with macros + + * plugins-scripts/check_uptime: My version of check_uptime + + Derived from check_mailq + +2018-01-19 Sven Nierlein + + * plugins/check_snmp.c: Update check_snmp.c + + remove unnecessary brackets in help text + +2018-01-19 Michael Kraus + + * plugins/check_snmp.c: check_snmp: make calcualtion of timeout value in + help output more clear + +2017-11-06 Bernard Spil + + * plugins/common.h: Fix build issue with MariaDB 10.2 + + As of 10.2 MariaDB no longer defines MYSQL_PORT. + +2017-10-17 Rasp8e + + * plugins/check_http.c: Adding Proxy-Authorization and extra headers in + the case of connection through PROXY to HTTPS + +2017-09-07 Marc Sánchez + + * configure.ac, plugins/check_load.c: Only turn on ordering procs by CPU + usage if PS_USES_PROCPCPU + Disable sorting of procs by CPU usage on check_load if procpcpu is not present on PS_VARLIST + + * plugins/check_load.c: Using PS_COMMAND constant and ordering output by + procpcpu + + * plugins/check_load.c: Making show top consuming processes option less + complicated + + * plugins/check_load.c: Adding print top consuming processes option to + check_load + + -W, --print-top-warning + Print top consuming processes on WARNING status + -C, --print-top-critical + Print top consuming processes on CRITICAL status + -n, --procs-to-show=NUMBER_OF_PROCS + Number of processes to show when printing top consuming + processes. Not useful without -W or -C. Default value is 5 + +2017-09-06 Marc Sánchez + + * plugins/check_apt.c: Adding packages-warning option + This option specifies the minumum number of packages available for upgrade to return WARNING status. Default is 1 package. + +2017-09-04 Michael Kraus + + * plugins/negate.c: Output plugin's stderr to stderr + + Output plugin's stderr to stderr and do not exit with WARNING in that case + +2017-06-07 Stephane Lapie + + * plugins-scripts/check_mailq.pl: Fix regexp for nullmailer "mailq" + output + + As it currently is, the regular expression does not match mailq command + output on a Debian Jessie setup. + + Three erroneous behaviors fixed : + - Meaningful lines do not end with the "bytes" word + - There might be one or more space before the byte count, not 2 + - Time match was completely broken, it only accounted for 0-29 minutes + and 0-29 seconds. + +2017-05-31 Christopher Odenbach + + * plugins/check_swap.c: repaired "-n" behaviour. If run with "-n ok" a + host which ran + completely out of swap space would return "ok" which is + not desired. It should only return "ok" if there is no + swap space configured at all. + +2017-05-16 Lee Clemens + + * plugins-scripts/check_mailq.pl: Add mailq -C option for config dir or + config file + + New variable, mailq_args, is appended for postfix mta mailq commands + + Fixes #1489 + +2017-04-21 Karol Babioch + + * plugins/check_dig.c: plugins: check_dig: Fix spelling + +2017-04-05 phowen + + * .travis.yml, plugins-scripts/check_file_age.pl: resolve issues from + code review + +2017-03-26 Christopher Odenbach + + * plugins/tests/check_http.t: Added tests for virtual port behaviour. + Separated from all other tests this time. + +2017-03-13 Sven Nierlein + + * plugins-scripts/t/utils.t: script tests: fix relative lib path in + utils test + + utils.pm uses relative include ".." but the path is relativ to the current folder, so it + does not work when running "perl t/utils.t". Just add another lib of "." fixes that. We could + use FindBin but we don't want to make it unnecessarily complicated. + +2017-03-12 Sven Nierlein + + * plugins/t/check_udp.t: udp test: prefer nc over netcat syntax + + sles 12 systems have netcat symlinked to nc and so expect nc syntax for netcat. + + * plugins/t/check_disk.t: check_disk test: increase assumed thresholds + + The check_disk fails if the build system has more than 100GB of free disk + space. Lets make this 100TB and we are safe for a couple more years. + +2017-03-10 Sven Nierlein + + * .travis.yml, plugins/t/NPTest.cache.travis, plugins/t/check_http.t, + plugins/t/check_tcp.t: remove hardcoded verisign.com tests + + and make it configurable + + * .travis.yml: make travis tests more reliable + + - add-apt-repository might be missing, so install it to be sure + - killing ntp might fail if there is none + - removing ipv6 from etc/hosts should not fail + + * plugins-scripts/check_disk_smb.pl: fix timeout issue with + check_disk_smb + + check_disk_smb hangs if the smbclient is still running. So send a sigint to all + childs and exit cleanly. + + * plugins/t/check_snmp.t: make snmp tests more reliable + + snmp tests fail if the snmp daemon runs systemd, then the process with 1 has arguments. Convert + the test into a regex which works for sysv and systemd. + +2017-03-12 Sven Nierlein + + * plugins/check_dns.c: check_dns: fix error detection on sles nslookup + + on sles (ex. 11sp1) systems the nslookup output for not found was not parsed correctly + and interpreted as ok when it should be critical: + + ./check_dns -H nosuchhost.nodomain -t 1 -vvv + /usr/bin/nslookup -sil nosuchhost.nodomain Server: 10.0.2.3 + Address: 10.0.2.3#53 + Non-authoritative answer: + *** Can't find nosuchhost.nodomain: No answer + DNS OK: 0.011 seconds response time. nosuchhost.nodomain returns |time=0.010892s;;;0.000000 + +2017-02-14 phowen + + * plugins-scripts/check_file_age.pl, plugins-scripts/t/check_file_age.t: + add range checking to check_file_age + +2017-02-07 Gerhard Lausser + + * plugins/check_snmp.c: check_snmp: put the "c" (to mark a counter) + after the perfdata value + +2017-01-17 Jan Wagner + + * NEWS: Add missing changes + +2017-01-16 Valentin Vidic + + * plugins/check_apt.c: check_apt: Add -l/--list option to print packages + +2017-01-10 Holger Weiss + + * plugins-root/check_icmp.c: Apply another spelling fix + +2017-01-06 Jan Wagner + + * plugins-scripts/check_oracle.sh: Fixing shellcheck SC2166 + + * plugins-scripts/check_oracle.sh: Fixing shellcheck SC2162 + + * plugins-scripts/check_oracle.sh: Fixing shellcheck SC2143 + + * plugins-scripts/check_oracle.sh: Fixing shellcheck SC2009 + + This requires pgrep from the procps package. + + * plugins-scripts/check_log.sh, plugins-scripts/check_oracle.sh, + plugins-scripts/check_sensors.sh: Fixing shellcheck SC2086 + + * plugins-scripts/check_log.sh, plugins-scripts/check_oracle.sh, + plugins-scripts/check_sensors.sh: Fixing shellcheck SC2006 + +2016-03-03 Elan Ruusamäe + + * plugins/check_ping.c: understang ping6 output from iputils package + +2016-12-29 Christian Schmidt + + * plugins/check_apt.c, plugins/t/check_apt.t: Add --only-critical switch + to check_apt + +2016-12-23 Nicolai + + * plugins/t/NPTest.cache.travis, plugins/t/check_dns.t: check_dns: Small + test cleanup + + * plugins/t/NPTest.cache.travis: check_dns: Fix travis tests + + (or try to fix it...) + + * NEWS, THANKS.in, plugins/check_dns.c, plugins/t/check_dns.t: + check_dns: Tests and info + +2016-12-21 Nicolai Søborg + + * plugins/check_dns.c: check_dns: Accept CIDR + +2016-12-19 Patrick Rauscher + + * plugins/check_dns.c: check_dns: allow for IPv6 RDNS + +2016-12-08 Jan Wagner + + * .travis.yml: travis-ci: Install mariadb only if no MySQL is present + +2016-12-07 Holger Weiss + + * NEWS: Mention check_dhcp fix + +2016-12-07 Harald Koch + + * plugins-root/check_dhcp.c: properly remove MSG_PEEK in check_dhcp.c. + Fixes #1450. + +2016-11-30 Jan Wagner + + * plugins-root/check_icmp.c, plugins/check_fping.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_pgsql.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + po/de.po, po/fr.po, po/monitoring-plugins.pot: Spelling fixes suggested + by lintian + +2016-11-29 Jan Wagner + + * .travis.yml: Revert "travis-ci: Workaround travis-ci/travis-ci#329" + + Encrypted env variables are not available for PRs + + This reverts commit fe69d3680a1104adcc35d3722f38ac05a976e21f. + + * .travis.yml: travis-ci: Drop clang++, which makes no sense here + + * .travis.yml: travis-ci: Disable notification via mail + + * .travis.yml: travis-ci: Workaround travis-ci/travis-ci#329 + + By encrypting the notification settings. This still fail for ppl + with push access to the origin repro while pushing to their own + clone. + +2016-11-29 Holger Weiss + + * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.2 release + + * doc/RELEASING.md: Update command line for tagging + + * doc/RELEASING.md: Fix a typo + + * doc/RELEASING.md: Apply more cosmetic changes + + * doc/RELEASING.md: Don't forget to commit NEWS + + * doc/RELEASING.md: Apply more formatting fixes + + * doc/RELEASING.md: Clarify name of remote repo + + * doc/RELEASING.md: Fix code blocks within lists + + Code blocks within lists must be indented with eight spaces. + + * doc/RELEASING.md: Use HTML-style comment + + * doc/RELEASING, doc/RELEASING.md: Rewrite doc/RELEASING notes + + Update the documentation on creating a Monitoring Plugins release, and + convert it to Markdown. + +2016-11-28 Holger Weiss + + * NEWS: Cosmetic changes + + * THANKS.in: Update THANKS.in file + + * NEWS: Remove attributions from NEWS file + + Attributions were inconsistently added to only some of the NEWS entries, + and we have other places for attributing contributions. + + * NEWS: Clean up NEWS entries for the 2.2 release + + ... and group them by plugin. + + * tools/update-thanks: Match case-insensitively + + When checking whether an author name already exists in the AUTHORS or + THANKS.in file, perform a case-insensitive match. + + * THANKS.in: Add new authors + + Update the THANKS.in file with the new Git commit authors. + + * NEWS: Add missing entries + +2016-11-21 Jan Wagner + + * .travis.yml: travis-ci: Adding clang to the matrix + + See https://docs.travis-ci.com/user/multi-os/#Example-Multi-OS-Build-Matrix + for Multi OS matrix + + * .travis.yml: travis-ci: Implement a matrix + + See https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix + +2016-11-21 Holger Weiss + + * plugins/check_radius.c: check_radius: Make compiler happy + +2016-11-21 Oliver Skibbe + + * plugins/check_disk.c: Revert "check_disk - show all disks if state is + ok and option error only is used" + +2016-11-21 Holger Weiss + + * plugins/sslutils.c: sslutils: Address compiler warning + + SSLv23_client_method() and friends return a pointer to a const-qualified + SSL_METHOD. + +2016-11-20 Jan Wagner + + * .travis.yml, plugins/t/NPTest.cache.travis: Creating and mounting + randisk to make use of check_disk tests + +2016-11-18 Jan Wagner + + * plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins/check_ntp_time.c: It's useful + to use 'useful' instead of 'usefull' + +2016-11-17 Holger Weiss + + * NEWS, REQUIREMENTS: Document radcli support in NEWS and REQUIREMENTS + + * plugins/check_radius.c, plugins/check_smtp.c, plugins/netutils.c, + plugins/netutils.h: check_radius: Replace functions removed in radcli + + The radcli library no longer offers the rc_get_ipaddr(), + rc_good_ipaddr(), and rc_own_ipaddress() functions. + + * plugins/check_radius.c: check_radius: Fix rc_send_server() call for + radcli + + With radcli, the rc_send_server() function expects an additional + argument. + +2016-11-15 Holger Weiss + + * plugins/check_radius.c: check_radius: Remove unused variable + + The radcli library doesn't define the ENV type, and we don't use it + anyway. + +2016-11-05 Jan Wagner + + * .travis.yml, configure.ac, plugins/check_radius.c: This patch adds + support for using the readcli lib. + + http://radcli.github.io/radcli/ + + (Closes #1437) + +2016-11-13 vagrant + + * configure.ac, plugins/check_http.c, plugins/check_smtp.c, + plugins/check_tcp.c, plugins/common.h: add openssl 1.1 support + + changes: + - CRYPTO_lock detection replaced in configure.ac. We don't use that + function anywhere, so just replace it with the suggested one from + https://wiki.openssl.org/index.php/Library_Initialization#Autoconf + - OPENSSL_NO_SSL2 is no longer defined while ssl2 is not included. + Set it ourself using the suggested openssl 1.1 version check from + https://wiki.openssl.org/index.php/1.1_API_Changes#Backward_compatibility + - openssl 1.1 sends a sigpipe if the connection is still open when + calling SSL_shutdown(), so move the close before the shutdown. + +2016-11-11 Sven Nierlein + + * plugins/tests/check_http.t: Revert "adopt http test to changed ssl + expire date output" + + This reverts commit 6cd50bc42cb4b25a3c0f7153df7f83b7262f404b. + + * plugins/tests/check_http.t: tests: make tests reliable for forcing the + locale to C + + * .travis.yml: clean cpan installation + + HTTP::Daemon::SSL gets installed as pkg already. + + * NEWS: update news file + + * plugins/t/check_http.t: check_http: add host header tests + + * .travis.yml: travis: install HTTP::Daemon::SSL perl module + + which is required for plugins/tests/check_http.t + + * plugins/tests/check_http.t: adopt http test to changed ssl expire date + output + +2015-09-15 Christopher Odenbach + + * THANKS.in, plugins/check_http.c: patch to support the concept of + virtual ports + +2016-11-08 Sven Nierlein + + * THANKS.in: update thanks file + +2016-05-05 Christian Kujau + + * plugins/check_dig.c: check_dig: use +retry instead of +tries + + After upgrading from an Ubuntu/15.10 to 16.04 installation, I noticed that + check_dig is always returning a WARNING: + + $ /usr/lib/nagios/plugins/check_dig -l localhost -v + /usr/bin/dig -p 53 @127.0.0.1 localhost A +tries=3 +time=6 + Looking for: 'localhost' + DNS WARNING - 0.008 seconds response time (dig returned an error status)|time=0.008274s;;;0.000000 + + The older Ubuntu installation got its check_dig from the + nagios-plugins-standard package[0] which did not include the +tries + option. The current Ubuntu version provides its check_dig from the + monitoring-plugins-standard package[1], which _does_ use the +tries + option that was introduced with df53473[2]. + + On my system, it so happens that /usr/bin/dig is provided not by the + (BIND) dnsutils package but by knot-dnsutils[3] from the Knot DNS project. + The Knot dig(1) command doesn't support the +tries option[4] but does + support +retry (which is also supported[5] by the BIND dig(1) command). + + One way to fix that would be for me to install the BIND dnsutils package. But I did not + want to do that: it's so much larger in size and pulls in much more dependencies + than the knot-dnsutils package. + + The patch below changes check_dig to use +retry instead of +tries. Both + options are similar, but not the same: + + +retry - Sets the number of times to retry UDP queries to server to T + instead of the default, 2. Unlike +tries, this does not include + the initial query + + As number_tries seems to be hard coded to 3, I've lowered DEFAULT_TRIES to + 2 so check_dig should behave as before (with +tries=3). + + Thanks, + Christian. + + [0] http://packages.ubuntu.com/wily/nagios-plugins-standard + [1] http://packages.ubuntu.com/xenial/monitoring-plugins-standard + [2] https://github.com/monitoring-plugins/monitoring-plugins/commit/df53473 + [3] http://packages.ubuntu.com/xenial/knot-dnsutils + [4] https://www.knot-dns.cz/docs/2.x/html/man_kdig.html#notes + [5] https://ftp.isc.org/isc/bind9/cur/9.10/doc/arm/man.dig.html + +2016-05-04 Sebastian Herbszt + + * plugins/check_ide_smart.c: check_ide_smart: remove unused function + + Remove function unused since commit b5cc292. + +2016-11-08 Sven Nierlein + + * plugins/t/NPTest.cache.travis: tests: enable snmp tests + + Enabled snmp tests against snmpd on localhost. It was installed already + in the travis file, we just need to enable the tests by setting the + parameters in the answers file. + + * plugins/t/check_snmp.t: check_snmp: fix number of tests skiped + + * plugins/t/check_snmp.t: check_snmp: add testcase for no datatype + + * plugins/check_snmp.c: Revert "check_snmp: fix push request 1173 for + SNMP responses without datatype indicator" + + This reverts commit 3178c8c0ff18822a04fe01c749f3564887473eed. + + * THANKS.in: Revert "update thanks file" + + This reverts commit 4403c402cba0315c2cb9ebe40639a5fe312d643e. + + * THANKS.in: update thanks file + +2015-08-26 Thomas Kurschel + + * plugins/check_snmp.c: check_snmp: fix push request 1173 for SNMP + responses without datatype indicator + +2016-11-07 Sven Nierlein + + * plugins/check_load.c: fix superfluous argument to printf (#fixes 1308) + + * NEWS, THANKS.in: update news and thanks file + + * plugins/t/check_http.t: tests: adjust check_http to new output format + +2015-11-25 Peter (pir) Radcliffe + + * plugins/sslutils.c, plugins/tests/check_http.t: GMT expiry display + + Change solution to display GMT time in the local display format with + the offset number of hours from GMT to be clear about what timezone + this is if the local display format does not include offset. + + * plugins/tests/check_http.t: Revert "Fix check_http test time output" + + This reverts commit 2d9e61a4382b8366331cde7617dbc4e381a0219a. + +2015-11-24 Peter (pir) Radcliffe + + * plugins/tests/check_http.t: Fix check_http test time output + + Tests need to match new output time and timezone. + + * plugins/sslutils.c: Use GMT timezone in SSL certs + + SSL certs are required to use times in GMT per + https://www.ietf.org/rfc/rfc5280.txt but the mktime() here assumes the + current timezone. + + Fix the time_t conversion to be done assuming GMT with timegm() and + only do it once rather than twice. + + Display the expiry date and time with ISO format years and give an + offset from GMT and a timezone to be very clear about exactly what time + is being displayed. Time given is correct and now in the machine’s + timezone. + +2015-05-19 abrist + + * NEWS, THANKS.in, plugins/check_snmp.c: check_snmp.c - Added IPv6 + support + + The "-6" optarg now prepends the server_address with "udp6:" for the + snmpget external command as per the net-snmp syntax at: + http://www.net-snmp.org/wiki/index.php/FAQ:Applications_28 + + Thanks to DrydenK (Roberto Greiner) for the heads up. + +2016-11-07 Sven Nierlein + + * plugins/t/check_users.t: check_users: add new test cases + + * plugins/check_users.c: check_users: still allow zero thresholds + +2016-11-07 John C. Frickson + + * NEWS, plugins/check_users.c, plugins/utils.c, plugins/utils.h: + check_users not correctly detecting thresholds + + Fix for issue https://github.com/nagios-plugins/nagios-plugins/issues/81 + + check_users now uses the standard warning and critical ranges parser and + a standard perdata output routine. + +2016-11-04 Oliver Skibbe + + * plugins/check_disk.c: check_disk - show all disks if state is ok and + option error only is used + + This fix changes output of check_disk in case of --error-only/-e option + is used and state is ok + + - Old output: DISK OK + - New output: DISK OK - free space: / 159731 MB (83% inode=61%); + /dev/shm 2926 MB (100% inode=99%); /boot 58 MB (32% inode=99%); + + Resolves: #1420 + +2016-03-10 Sven Nierlein + + * plugins/check_by_ssh.c: check_by_ssh: print command output in verbose + mode + + right now it is not possible to print the command output of ssh. check_by_ssh + only prints the command itself. This patchs adds printing the output too. This + makes it possible to use ssh with verbose logging which helps debuging any + connection, key or other ssh problems. + Note: you must use -E,--skip-stderr=, otherwise check_by_ssh would + always exit with unknown state. + + Example: + + ./check_by_ssh -H localhost -o LogLevel=DEBUG3 -C "sleep 1" -E 999 -v + +2016-09-16 Holger Weiss + + * plugins-root/check_dhcp.c: check_dhcp: Make xid a bit more random + + Don't just use the current time(2) to seed the PRNG that generates the + xid. A DHCP server might be checked multiple times per second. + +2016-09-14 Holger Weiss + + * plugins-root/check_dhcp.c: check_dhcp: Don't peek before reading + response + + Omit a recvfrom(3) call which has the MSG_PEEK flag set and should have + no effect at all. According to a comment in the code, this call was + meant to be a workaround to an opaque issue. If anyone runs into that + issue, we should fix it properly instead. + +2016-03-24 Oliver Skibbe + + * AUTHORS: Update AUTHORS + + Added Oliver Skibbe to Authors + +2016-02-22 Holger Weiss + + * plugins/t/check_http.t: Let check_http test use HTTP/1.1 + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/strcasestr.m4, gl/strcasestr.c: Add Gnulib module "strcasestr" + +2016-02-22 Sven Geggus + + * plugins/check_dns.c: DNS is case insensitive! + + Thus recent Versions of bind will no longer change .IN-ADDR.ARPA to lowercase + as the uppercase version is also valid. + + To have check_dns.c consider this fact change strstr to strcasestr + +2015-11-04 Gerhard Lausser + + * plugins/check_http.c: Update check_http.c + + If a web page contains a nul character, check_http reads the complete page but --expect does not search beyond this character. + +2015-11-02 Gerhard Lausser + + * plugins/check_ldap.c: Typo in check_ldap.c usage + +2015-10-28 Klaus Ethgen + + * plugins/check_disk.c: Fixing the stuff that is broken on btrfs + + (Closes #1357) + +2015-10-21 Jan Wagner + + * .travis.yml: travis-ci: Adding spwaspace to trusty env + + * .travis.yml: travis-ci: Stop local running ntpd + +2015-10-20 Jan Wagner + + * .travis.yml: travis-ci: Detect LDAP config + + * .travis.yml: travis-ci: Add ppa:waja/precise-backports for fixed + faketime + + * .travis.yml: travis-ci: Clearly documentx why we need install mariadb + + * .travis.yml: travis-ci: Work around broken /etc/hosts on trusty env + +2015-10-19 Jan Wagner + + * .travis.yml: travis-ci: Adding multiverse repository as long it's not + default. snmp-mibs-downloader is located there + + * .travis.yml: travis-ci: Install mariadb-client and mariadb-server + + * .travis.yml: travis-ci: Migrating to Trusty CI env + +2015-10-16 Holger Weiss + + * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.1.2 release + +2015-10-15 Bernd Apfel + + * plugins-scripts/check_mssql.pl: check_mssql.pl: switched alarm timeout + + - alarm() now uses -t option + contributed by Bernd Arnold (wopfel@gmail.com) + + closes #991 + +2015-10-15 Daniel Stirnimann + + * plugins/check_dig.c: check_dig: expected answer is now incasesensitive + + check_dig was casesensitive if an expected answer is given. + Switching strstr with strcasestr fixes this issue + + While testing i noticed a bug where expected is not an exact match + New issue for that is opened #1385 + + This fix closes #1233 + +2015-10-13 Jan Wagner + + * NEWS: Updating NEWS + +2015-10-12 Holger Weiss + + * NEWS, configure.ac, plugins/Makefile.am, plugins/check_disk.c: Revert + "Don't let check_disk hang on hanging file systems" + + This reverts commit 6986aa1d0a352d8d02eed4896034631fffd25a27. That + commit leads to issues on non-Linux systems, and it seems to not + (always) work as expected on Linux, either. + + Conflicts: + plugins/Makefile.am + plugins/check_disk.c + + Closes #1377 and closes #1329. + +2015-10-08 Sven Nierlein + + * doc/developer-guidelines.sgml: fix guidelines docbook syntax + + no newlines allowed after + +2015-10-08 Holger Weiss + + * doc/developer-guidelines.sgml: Add missing tag + +2015-10-08 Oliver Skibbe + + * plugins/check_smtp.c: check_smtp: extended support for expect option + + expect option (-e) supported only first response, so checking for + any other response like 250-xxx would never match. This fix stores + return of relevant buffer + + closes #1381 + + * plugins/check_smtp.c: check_smtp.c: modified SSL check for use with -e + + - currently STARTTLS check does not work with -e if there's text + like '220 hostname ESMTP*'. This is caused by SMTP answer from + host. Postfix answer: 220 2.0.0 Ready to start TLS, Exchange + 2010: 220 2.0.0 SMTP server ready. This fix checks against 220 + + closes #1093 + +2015-10-07 Oliver Skibbe + + * plugins/check_http.c: * check_http: added timeout to perfdata as max + val + +2015-10-06 Holger Weiss + + * plugins/check_smtp.c: check_smtp: Let "-D" option imply "-S" + + * plugins/check_smtp.c: check_smtp: QUIT SMTP connection when "-D" is + used + + Don't forget to issue an SMTP QUIT command when the -D/--certificate + option is specified. This avoids undesired MTA log messages. + +2015-07-28 abrist + + * plugins-root/pst3.c: Fix for unclosed filehandle in pst3 on Solaris + + On Solaris, check_procs uses pst3 instead of /bin/ps (see + http://monitoring-plugins.org/doc/faq/ps-on-solaris.html for background). There's + a small bug in pst3 which causes it to NOT report some processes that are at + the end of the process table, at least on very busy systems (we noticed this + on a CoolThreads T5240 with load averages up to 90). + + The bug is that a filehandle is not properly closed. + + Thanks to jwinkle01 for finding and patching the bug. + + (Closes #1203) + +2015-10-05 Jan Wagner + + * plugins-scripts/Makefile.am: Testing shell scripts with 'sh -n' + + * plugins-scripts/Makefile.am: Cosmetical changes + +2015-10-04 Holger Weiss + + * NEWS: Fix typos + + * NEWS, plugins/check_http.c, plugins/netutils.h, plugins/sslutils.c: + check_http: Allow for requesting TLSv1.1/TLSv1.2 + + check_http's -S/--ssl option now allows for requesting the TLSv1.1 and + TLSv1.2 protocols. Apart from that, a '+' suffix can be appended in + oder to also accept newer protocols than the specified version. + + Closes #1338, and closes #1354, and closes #1359. + +2015-10-04 Jan Wagner + + * NEWS, plugins-scripts/check_ntp.pl: check_ntp.pl: Droping this + superseded plugin + + * plugins-scripts/check_netdns.pl: check_netdns.pl: Prototyping + functions + +2015-10-04 Sven Nierlein + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c: use unknown exit + code for help/version in plugins-root as well + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dbi.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c: use + unknown exit code for help/version in plugins + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_mssql.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl, + plugins-scripts/t/check_rpc.t: change exit code to unknown on help and + version info + + * doc/developer-guidelines.sgml: use exit code 3 for version and help + + Plugins which use OK state for help or version information may run + unnoticed in that modes without doing any check. So its good + style to let version and help exit with Unknown state. + +2015-10-04 Jan Wagner + + * plugins-scripts/check_ntp.pl: check_ntp.pl: Using FindBin + + * .travis.yml: travis-ci: Add dependencies to run 'perl -wc' + + * plugins-scripts/Makefile.am: Testing scripts with 'perl -wc' + + * plugins/sslutils.c: sslutils: Remove superfluous parenthesis for sslv3 + function too + +2014-12-20 Sebastian Herbszt + + * plugins/sslutils.c: sslutils: remove superfluous parenthesis + + Remove superfluous parenthesis. + +2015-03-06 Oliver Skibbe + + * plugins/t/check_snmp.t: check_snmp: modified tests + + (Closes #1325) + + * plugins/check_snmp.c: check_snmp.c: switched DEFAULT_TIMEOUT to + DEFAULT_SOCKET_TIMEOUT (provided by utils.h), already used by help + description, see issue #1318 + +2015-05-03 Laurent Licour + + * plugins/check_http.c: plugins/check_http.c - fix regression introduced + in commit 388ea928 (Host header) + +2014-10-30 LAURENT LICOUR + + * plugins/check_http.c: plugins/check_http.c - fix Host header if + explicitly set with -k + +2015-10-02 Sven Nierlein + + * plugins/tests/check_http.t: fix tests for certificates expire date + with seconds + + * THANKS.in: update thanks file + + * .travis.yml, plugins/t/check_http.t: add faketime based tests for + check_http + + * plugins/sslutils.c: fix typo from #1336 + + if exactly one hour before the expire date, we would mixup + minutes and hours. + +2015-04-23 Matthias Hähnel + + * plugins/sslutils.c: Update sslutils.c + + Fixed Output if the expiration time is below one hour and code cleanup + +2015-04-20 Matthias Hähnel + + * plugins/sslutils.c: Update sslutils.c + + optimize output if certificate expires in less then 24h + thx to axel.schmalowsky@sixt.com for this patch + +2015-10-02 Elan Ruusamäe + + * plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: also + update check_rpc.pl and check_wave.pl + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_mssql.pl, + plugins-scripts/check_netdns.pl: drop superfluous libexecdir + + utils.pm locate is already convered by FindBin + +2015-04-12 Sven Nierlein + + * .travis.yml: install snmpd on travis tests + + because its required for ./plugins/tests/check_snmp.t + + * .travis.yml: enable libtab on travis builds + + to enable some more tests + + * .travis.yml: add perl snmp to travis dependencies + + it is required for the check_snmp tests + +2015-10-02 Holger Weiss + + * NEWS: Mention check_ups performance data fix + +2015-03-27 Louis Sautier + + * plugins/check_ups.c: Fix incorrect performance data thresholds + + Closes #1330 + +2015-10-02 Jan Wagner + + * plugins/check_snmp.c: check_snmp: small improvement by anonymous + submission + + - response should not start with the delimiter + - OID response value taken into account + + Closes issue #1029 + Closes push request #1173 + +2015-10-02 Holger Weiss + + * plugins-root/check_dhcp.c: check_dhcp: Fix option parsing + + The call_getopt() function didn't always return the correct number of + processed arguments. However, since check_dhcp doesn't support + non-option arguments, the caller doesn't need this number anyway. + + Closes #1345. + +2015-05-05 Jan Wagner + + * plugins-root/check_dhcp.c: Fixes segfaults when running via monitoring + worker + (off-by-one) + + Grabed from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=198318 + +2015-10-01 Sven Nierlein + + * plugins/t/NPTest.cache.travis: travis: fix http test host + +2015-08-27 Michael Melcher + + * plugins/check_http.c: check_http: Adding support for checking + SSL-Websites through Proxies + + Ported the fix from Frank4dd to the latest git version. See also http://nagios.frank4dd.com/howto/monitor-ssl-web + sites-through-proxy.htm + +2015-10-01 Sven Nierlein + + * plugins/t/NPTest.cache.travis: travis: fix http test host + +2015-07-25 Jérémie Courrèges-Anglas + + * plugins/sslutils.c: sslutils: Check if OpenSSL supports SSLv3. + +2015-08-13 Andrew Widdersheim + + * plugins/check_fping.c: Allow check_fping to autodetect ipv6 addresses + + Stole the logic in check_ping that allows it to autodetect whether an + address is ipv6 or not. Now the user does not have to specify -6 when + using check_fping with ipv6 addresses. + +2015-04-23 Sven Nierlein + + * plugins/t/check_ldap.t: check_ldap: fix number of skipable tests + +2015-04-22 Sven Nierlein + + * NEWS: mention check_ldap changes in news file + + * plugins/check_ldap.c: check_ldap: fix entries threshold check + + fix typo in threshold check. instead of setting the state always + to warning, use the result from the thresholds entry check. + + * .travis.yml, plugins/t/NPTest.cache.travis, plugins/t/check_ldap.t: + add check_ldap test + + install openldap on travis and grep base dn from slapcat. + +2015-04-19 Gerhard Lausser + + * plugins/check_ldap.c: add counting of entries to check_ldap + + * plugins/utils.c: add sperfdata function which can handle threshold + ranges + +2015-04-13 Andrew Widdersheim + + * plugins/check_tcp.c: Readability fix + +2015-04-12 Elan Ruusamäe + + * doc/RELEASING: Update RELEASING + + fix some typos. + +2015-04-12 Sven Nierlein + + * .travis.yml: install snmpd on travis tests + + because its required for ./plugins/tests/check_snmp.t + + * .travis.yml: enable libtab on travis builds + + to enable some more tests + + * .travis.yml: add perl snmp to travis dependencies + + it is required for the check_snmp tests + + * plugins/tests/check_snmp.t: fix snmp test for included threshold + + since 6623a1 check_snmp prints the thresholds along the performance data. + This adjust our test cases accordingly. + +2015-04-11 Sven Nierlein + + * perlmods/Monitoring-Plugin-0.37.tar.gz, + perlmods/Monitoring-Plugin-0.39.tar.gz: update perl module to 0.39 + +2015-01-29 Sven Nierlein + + * plugins-root/check_icmp.c: make use of MSG_CONFIRM optional + + since MSG_CONFIRM is a linux thing and only available on linux kernels >= 2.3.15, see send(2) + +2014-12-20 Sebastian Herbszt + + * plugins/utils.c: utils: remove unused variable + + Remove unused variable. + + * plugins/check_ntp_time.c: check_ntp_time: remove unused variables + + Remove unused variables. + + * plugins/check_ntp.c: check_ntp: remove unused variables + + Remove unused variables. + + * plugins/check_disk.c: check_disk: remove unused variables + + Remove unused variables. + +2014-12-15 Holger Weiss + + * tools/update-thanks: Add tools/update-thanks script + + The tools/update-thanks script can be used to update the THANKS.in file. + +2014-12-09 Sebastian Herbszt + + * plugins/negate.c: negate: remove unused variables + + Remove unused variables. + +2014-12-08 Sebastian Herbszt + + * plugins/check_dns.c: check_dns: remove dead code + + Remove code dead since commit 4efa917. + +2014-12-02 Holger Weiss + + * NEWS, THANKS.in, configure.ac, plugins-scripts/check_mailq.pl, + plugins-scripts/utils.pm.in: check_mailq: Add sudo support + + This addition is based on a patch contributed by Christopher Schultz. + + Closes #1099. + Closes #1171. + + * NEWS: Mention check_disk enhancement + + Closes #867. + Closes #1186. + + * configure.ac, plugins/Makefile.am: Cosmetic change: + s/THRLIBS/THREADLIBS/ + + Use a more intuitive variable name. + + * plugins-root/check_icmp.c: check_icmp: Cast size_t values for + printf(3) + + Convert size_t values to unsigned long for printf(3) in order to + maximize portability. + + * configure.ac: Don't let pthread check depend on OS + + Don't check the operating system environment to detect the correct + linker flags for using the POSIX thread library. + + * NEWS: Modify list of changes for 2.1.1 release + + Make the list of changes slightly more descriptive. + +2014-12-01 Jan Wagner + + * doc/RELEASING: Fixing and removing outdated information + + * NP-VERSION-GEN, configure.ac: Prepare release + + * THANKS.in: Add new authors + + * NEWS: Updating all the fixes + + * doc/RELEASING: We are now monitoring-plugins + +2014-11-30 Sebastian Herbszt + + * plugins/check_tcp.c: check_tcp: fix help description regarding escape + option + + The help description should print '\\' for backslash not just '\'. + +2014-12-01 Holger Weiss + + * plugins/check_ntp.c: check_ntp: Nul-terminate jitter data + + Make sure the jitter response is nul-terminated before parsing the data + using string functions. + +2014-11-30 Holger Weiss + + * plugins/check_ntp.c: Revert "plugins/check_ntp.c - Verify struct from + response" + + This reverts commit a04df3e1b67dc5eab3adc202cc89901f801cdeaa. The "fix" + was bogus in many ways and broke jitter checking. + + Conflicts: + plugins/check_ntp.c + +2014-11-27 Sebastian Herbszt + + * .gitignore: update .gitignore + + Add build-aux/test-driver to .gitignore. + +2014-11-30 Holger Weiss + + * plugins/check_disk.c: check_disk: Seperate declarations from code + + * plugins/check_disk.c: check_disk: Remove unused status variable + + We didn't actually use the exit status provided by pthread_join(3) for + anything. + +2014-11-28 Holger Weiss + + * plugins/check_disk.c: check_disk: Fix pthread start routine type + + The function pointer passed as third argument to pthread_create(3) must + be of type void *(*)(void *). + +2013-10-01 Gerhard Lausser + + * configure.ac, plugins/Makefile.am, plugins/check_disk.c: Don't let + check_disk hang on hanging file systems + +2014-11-28 Holger Weiss + + * NEWS: Mention HP-UX fixes for check_procs + + Closes #1288. + +2014-08-26 Yannick Charton + + * configure.ac: Added particular ps command for HP-UX (check_procs) + +2014-11-28 Holger Weiss + + * NEWS: Mention the check_real fix + + Closes #1290. + +2014-09-05 Andrew Berglund + + * plugins/check_real.c: Added missing CR in DESCRIBE request. + +2014-11-28 Holger Weiss + + * plugins-root/check_icmp.c: check_icmp: Fix a few type errors + + * plugins-root/check_icmp.c: Don't mix variable declarations and code + + We still support pre-C99 compilers. + +2014-02-03 Matthieu Kermagoret + + * plugins-root/check_icmp.c: Use kernel reception time on ICMP packets + to compute rtt. + + This commit uses the SO_TIMESTAMP feature of setsockopt to fetch + kernel reception time of ICMP packets. This avoids invalid + computations of rtt on machines with heavy load and/or heavy + network traffic. + +2014-11-28 Sven Nierlein + + * lib/utils_cmd.c: make constants from maxfd values (#1300) + + its good practice to use constants instead of (random) values. + +2014-11-19 nafets + + * lib/utils_cmd.c: avoid a segfault, if ulimit is set to unlimited + +2014-11-28 Jan Wagner + + * NEWS: Adding a warning for raising to CRITICAL for protocal/version + errors of check_ssh + +2014-06-30 Sven Nierlein + + * plugins/check_ssh.c: check_ssh: change warning to critical for + protocal/version errors + + It makes more sense to exit critical if a explicit version/protocol is requested. This + would also be more consistent with other plugins. Other string matching plugins like + check_snmp or check_http exit critical if the result does not match. + +2014-11-28 Holger Weiss + + * NEWS: Mention new "check_nt -l" parameters + + Closes #1253. + +2014-04-04 Andy Brist + + * plugins/check_nt.c: Added perfdata to check_nt. New -l options - + seconds|minutes|hours|days. + +2014-11-28 Holger Weiss + + * NEWS: Mention new check_snmp option + + Closes #1221. + +2013-12-26 Johannes Engel + + * plugins/check_snmp.c: Introduce support for SNMPv3 context in + check_snmp + + snmpget already supports using SNMPv3 contexts using the option "-n". + Thus all we need to do is introduce a new argument to check_snmp and + pass the argument on to snmpget using snmpget's option "-n". + Since "-n" is already in use for check_snmp for a different purpose, + we use "-N" instead. + +2014-11-28 Holger Weiss + + * NEWS: Mention check_snmp's perfdata thresholds + +2014-02-11 Andreas Seemueller + + * plugins/check_snmp.c: check_snmp: Add thresholds to performance data + +2014-11-27 Sebastian Herbszt + + * plugins/check_real.c: check_real: fix null termination + + Fix null termination introduced by commit b61f51a ("plugins/check_real.c - recv string null terminate"). + +2014-11-26 Sebastian Herbszt + + * plugins/check_ntp.c: check_ntp: fix null termination + + Fix null termination introduced by commit a04df3e ("plugins/check_ntp.c - Verify struct from response"). + + * plugins/check_apt.c: check_apt: fix memset + + Fix memset introduced by commit 9ce7369 ("plugins/check_apt.c - Print uninitialized ereg"). + +2014-11-17 nafets + + * plugins/check_by_ssh.c: added option to exit with an warning, if there + is output on STDERR + +2014-11-03 Holger Weiss + + * NEWS: Add warning regarding check_mrtgtraf change + + Closes #1296. + +2014-11-03 Adrian Murphy + + * plugins/check_mrtgtraf.c: Fix perfdata to comply with perfdata UOM + definition + +2014-11-02 Holger Weiss + + * LEGAL, Makefile.am: Remove LEGAL file + +2014-10-19 Jan Wagner + + * plugins/check_swap.c: Improving output when swap space has zero size + +2014-03-09 Davide Madrisan + + * plugins/check_swap.c: check_swap - fix comment + +2014-10-15 Holger Weiss + + * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.1 release + + * THANKS.in: Add new authors + + Update the THANKS.in file with the new Git commit authors. + + * FAQ: Remove outdated (RPM/DEB-related) questions + + * NEWS: Mention that we dropped the spec file + +2014-10-15 Jan Wagner + + * Makefile.am, configure.ac, monitoring-plugins.spec.in: Removing the + spec file, as it's broken + Even we have none feedback in PR #1283 + +2014-10-08 Holger Weiss + + * plugins-scripts/check_ifstatus.pl: check_ifstatus: Fix "-n" and "-u" + options + + Ignore interface if it's specified via "-n" OR "-u", not just when it's + specified via "-n" AND "-u". + +2014-10-06 Holger Weiss + + * lib/utils_base.c: Revert "Make use of xasprintf instead of asprintf" + + This reverts commit a143739ed286cf9ae003792dbb1ce26ce43f3312. + + Our current setup doesn't allow lib/*.c files to call functions defined + in plugins/utils.[ch]. + +2014-09-23 Jonas Genannt + + * NEWS, plugins-scripts/check_file_age.pl, + plugins-scripts/t/check_file_age.t: check_file_age: Provide performance + data + +2014-10-06 Jan Wagner + + * NEWS: Adding missing informations to NEWS + +2014-09-29 Jan Wagner + + * THANKS.in: Adding Simon to Thanks file + +2014-09-01 Simon Meggle + + * plugins-scripts/check_mailq.pl: check_mailq: fixed mailer names + + (Closes #1289) + +2014-09-16 Holger Weiss + + * NEWS, plugins/check_tcp.c: Fix check_jabber to work with Openfire + servers + + The plugin expected: + + + + But Openfire sends: + + + +2014-09-10 Holger Weiss + + * NEWS: Mention new check_ifstatus option + +2013-05-13 Nick Peelman + + * plugins-scripts/check_ifstatus.pl: Add check_ifstatus option to ignore + interfaces by name + + Ignoring by index is not always an option, as the index can change on + chassis switches as blade configurations change. + +2014-07-30 Jan Wagner + + * .travis.yml: travis-ci: create MySQL database 'test' + +2014-07-21 Jan Wagner + + * .travis.yml: travis-ci: Installing libhttp-daemon-ssl-perl to make + plugins/tests/check_http.t possible to run + + * .travis.yml: travis-ci: Using libfreeradius-client-dev as build-dep + +2014-08-20 Jan Wagner + + * plugins-scripts/check_log.sh, plugins-scripts/check_oracle.sh, + plugins-scripts/check_sensors.sh: Setting PATH at first + + * plugins-scripts/check_log.sh: check_log.sh: droping path from basename + while evaluating PROGNAME (Closes Debian Bug #758662) + +2014-08-06 Sven Nierlein + + * plugins/check_by_ssh.c: check_by_ssh: added --hostname support + + just like the guidelines and the help already suggests. + +2014-07-31 Sven Nierlein + + * plugins/tests/check_snmp.t: tests: skip extented snmp tests if snmpd + has no perl support + + solaris snmpd has no perl support by default, so this test will fail. + + * plugins/t/negate.t: tests: negate test fails when not run from plugins + folder + + * plugins/t/negate.t: tests: get current directory the perl way + + instead of hoping to have it in the environment. This at + least broke tests on solaris. + + * plugins/check_dns.c: check_dns: unified check output + + this also allows us to make tests against "critical" in the output. + + * plugins-scripts/t/check_disk_smb.t: tests: check_disk_smb may exit + with critical for unresponsive hosts too + + Unknown (ex. debian 7) + %> ./check_disk_smb -H 1.1.1.1 -s np_foobar -vvv + /usr/bin/smbclient //1.1.1.1/np_foobar -U guest% -c du + No Answer from Client + + Critical (ex. debian 8) + %> ./check_disk_smb -H 1.1.1.1 -s np_foobar -vvv + /usr/bin/smbclient //1.1.1.1/np_foobar -U guest% -c du + Connection to 1.1.1.1 failed + CRITICAL + +2014-07-31 Sven Nierlein + + * plugins/check_ntp_peer.c: check_ntp_peer: do not use uninitialized + results for max state + + s/t/jresult are not initialized if there is no corresponding threshold + supplied. So we shouldn't use them for calculating our result. + +2014-07-31 Holger Weiss + + * NEWS: Mention --with-qmail-qstat-command option + +2013-10-21 awiddersheim + + * configure.ac: Fix PATH_TO_QMAIL_QSTAT in configure + + When configuring PATH_TO_QMAIL_QSTAT the PATH_TO_MAILQ would get applied + instead after tests had passed. Also made --with-qmail-qstat-command a + configuration option. + +2013-09-30 Jan Wagner + + * THANKS.in: adding to THANKS + +2014-07-30 Jan Wagner + + * plugins/check_dns.c: check_dns: Use strchr instead of index + + * THANKS.in: Adding Alexander Wittig to THANKS.in + --- + Closes #1218 + Closes #1281 + +2013-12-16 Alexander Wittig + + * plugins/check_dig.c: check_dig: takes into account the -4 and -6 + switch + + Fix automatic DNS server name detection to honor -4 and -6 switches + (default to 127.0.0.1 or ::1 respectively, i.e. if -6 is given ::1 + is used instead of 127.0.0.1) + + * plugins/check_dig.c: check_dig: Fix to work with dig and drill tool + + FreeBSD starting with version 10 is shipped with ldns instead of bind as + resolver. Consequently the dig tool in base is replaced by drill. While dig can + still be installed as a third party application, it would be nice to make do + with the tools available in the system already. + This patch rearranges the command line used to invoke dig slightly so that it + can be used with both dig and drill (tested with dig 9.8.3-P1 and 9.9.4 as well + as drill 1.6.16). It would be really neat if the configure script could be + changed to automatically pick up drill when dig is not available (or the other + way around), but my autotools-foo is not good enough for that. + This part of the patch is an extended version of the locally maintained patch + currently deployed in the FreeBSD ports tree by Dmitry Sivachenko. + +2014-07-30 Sven Nierlein + + * tools/generate-change-log: workaround for broken Text::Wrap + + workaround for broken Text::Wrap: + "This shouldn't happen at /usr/share/perl/5.18/Text/Wrap.pm line 84." + changing huge to overflow make generating changelogs work again at + the price of not having changelog strictly cut of at 80 columns + anymore. Words longer than 80 characters will now printed in one + line. This mainly affects old sf.net urls. + + * tools/generate-change-log: no need for the signed off messages in our + changelog + +2014-07-30 Jan Wagner + + * lib/utils_base.c: Make use of xasprintf instead of asprintf + --- + Closes #1278 + +2014-01-22 Ricardo Maraschini + + * lib/utils_base.c: if asprintf fails, string is undefined + + if asprintf fails, string content becomes invalid. we need + to check if it ran OK by checking the returned value. + + in case of fail, asprintf returns -1, otherwise the number + of writen bytes is returned. + + also, on ubuntu 13.10 i've receiving a lot of warnings: + + "warning: ignoring return value of ‘asprintf’" + + this patches fixes some of them + +2013-09-29 Jan Wagner + + * plugins/check_dns.c: check_dns: returns incorrect state when + specifying server + + This patch verifies if the response is returned by the dns server we + are trying to check + --- + Closes #981 + Closes #982 + Closes #1164 + +2014-07-30 Jan Wagner + + * .travis.yml: travis-ci: create MySQL database 'test' + +2014-07-30 Sven Nierlein + + * plugins/t/check_dns.t: check_dns: added test for nonresponsive dns + server (#982) + +2014-07-29 Jan Wagner + + * THANKS.in: Adding Jason Benguerel + +2013-10-01 Jan Wagner + + * plugins/check_disk.c: check_disk: show troubled partition in verbose + mode + + I'm submitting a small patch to check_disk that will show which partitions are + actually causing the error state. This helps the human operator to quickly + identify the exact issue. I made it so a single -v flag is required so it + doesn't harm legacy code that may be parsing the original style of output. + + Thanks to Jason Benguerel. + --- + Closes #984 + Closes #1182 + +2014-02-05 abrist + + * plugins/check_ntp_time.c: check_ntp_time.c - Cleaned up usage and + added a note + + Closes #907 + Closes #1184 + +2014-07-21 Jan Wagner + + * THANKS.in: Adding Patrick McAndrew to THANKS.in + +2013-10-01 Jan Wagner + + * plugins/check_ntp_time.c: check_ntp_time: adding offset option + + Not sure if this is of use or not - we have a strange requirement to run + certain servers 5 minutes fast. I've added a switch to the check_ntp_time + to allow for this offset. + + Thanks to Patrick McAndrew. + +2014-05-19 abrist + + * plugins/netutils.c: netutils.c - A few more changes + + Changed bool to short. + + Removed first instance of is_socket to avoid + redeclaration error. + + Changed 'socket' to 'file socket' for verbosity. + +2014-05-07 Davide Madrisan + + * plugins/netutils.c: This patch will add the IP and port, or socket + name, to the error message and + thus simplify the problem debugging: no need to check for this information in + the Nagios configuration. + This function is only used by 'check_tcp.c'. + + Without the patch: + + $ ./plugins/check_tcp -H 127.0.0.1 -p 21 + Connection refused + $ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd + Permission denied + + With the patch: + + $ ./plugins/check_tcp -H 127.0.0.1 -p 21 + connect to address 127.0.0.1 and port 21: Connection refused + $ ./plugins/check_tcp -H /var/spool/nagios/cmd/nagios.cmd + connect to socket /var/spool/nagios/cmd/nagios.cmd: Permission denied + + Thanks to Davide Madrisan. + --- + Closes #1277 + +2013-10-01 Jan Wagner + + * THANKS.in, plugins/check_mysql.c: check_mysql: ignore authentication + failure + + This patch allows checking if MySQL server is running without providing valid + username and password. Similar to check_ssh plugin it returns MySQL server + version string and protocol number. + + Example: + check_mysql -n -H aaa.bbb.ccc.ddd + MySQL OK - Version: 5.0.51a-24+lenny5 (protocol 10) + + This is useful for monitoring servers where one does not have administrator + privileges or does not want to grant any privileges for the monitoring station. + + To enable this functionality new option --ignore-auth (-n) is added to + check_mysql plugin. + + Thanks to Julius Kriukas + + Closes #1020 + Closes #1178 + +2014-07-21 Jan Wagner + + * .travis.yml: travis-ci: Installing libhttp-daemon-ssl-perl to make + plugins/tests/check_http.t possible to run + +2014-07-21 Holger Weiss + + * test.pl.in: Use "C" locale when running test suite + + Some of our tests check locale-dependent plugin output, so let's make + sure "make test" is always using the "C" locale. + + * plugins/tests/check_http.t: Adjust date strings + + Adjust the expected date strings to the now-localized output produced by + plugins/sslutils.c. + + Closes #1275. + +2014-07-21 Jan Wagner + + * .travis.yml: travis-ci: Using libfreeradius-client-dev as build-dep + +2014-07-21 Holger Weiss + + * plugins/t/check_dns.t: Fix Perl warning + + Perl said: "Unrecognized escape \d passed through at ./t/check_dns.t + line 57." + +2013-10-01 Jan Wagner + + * THANKS.in, plugins/sslutils.c: sslutils: expire time in local timezone + format + + sshutils prints the expiry time of certificates in US format + this patch uses the strftime %c, I don't know how portable that is + + Thanks to Neil Prockter. + + Closes #1188 + Closes #1161 + Closes #977 + Closes #976 + Closes #975 + Closes #840 + Closes #382 + +2013-09-30 Jan Wagner + + * THANKS.in, plugins-scripts/check_ifstatus.pl: check_ifstatus: perfdata + bug + + The perfdata output violates the current Nagios Plugin Development Guidelines + (http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN202 : + "space separated list of label/value pairs"). + + Thus the Addon PNP did not read the perdata correctly. + + The patch replaces the commas with spaces in the perfdata output. + + Many thanks to Patric Wust. + --- + Closes #1169 and #721. + +2014-07-20 Jan Wagner + + * plugins/t/NPTest.cache.travis: travis-ci: Adding ports for check_hpjd + +2014-01-27 abrist + + * plugins/t/check_hpjd.t: added tests for check_hpjd port options + --- + Closes #1160 and #973 + +2014-01-24 abrist + + * NEWS, plugins/check_hpjd.c: Added check_hpjd port option to news and + clarified the port usage error. + + * plugins/check_hpjd.c: check_hpjd - Added a switch for port + specification. Defaults to 161. + +2014-03-03 abrist + + * plugins/t/check_ntp.t: check_ntp.t - fixed tests for new status output + closes #1236 and #1239 + +2014-02-14 abrist + + * plugins/check_ntp_peer.c: check_ntp_peer - Added specific state output + for each metric. It now should be easy to see which check caused the + alert. + +2013-10-01 Jan Wagner + + * THANKS.in, plugins-scripts/check_oracle.sh: check_oracle: --tns bad + string matching + + check_oracle in the 1.4.15 release doesn't correctly parse the output gotten + from at least Oracle 11 (with german locales). I guess it's probably more. + Also it completely needlessly uses sed where basic bash string parsing actually + does more than suffice (and does not run into possible problems with locales + like sed ;)). + -- + Just turning attached patch of github issue #1015 into a push request. + (Closes #1015 and #1191) + +2014-07-11 Holger Weiss + + * NEWS: Fix typo + + * NEWS, NP-VERSION-GEN, configure.ac: Prepare for the 2.0 release + + * NEWS: Wrap overly long line + +2014-07-10 Holger Weiss + + * THANKS.in: Update THANKS.in file with latest author + +2014-07-10 Mikael Falkvidd + + * plugins/t/check_procs.t: check_procs: Add delay after forking in test + + Forking raises a race condition, where the parent might run the + test before the child has had time to fork. If that happens, + an error similar to this is produced: + Failed test 'Output correct' + at ./t/check_procs.t line 32. + 'PROCS OK: 0 processes with args 'sleep 7' | processes=0;;;0;' + doesn't match '/^PROCS OK: 1 process?/' + + Sleeping a bit should avoid the problem. It might be enough to + sleep less than a second, but perl's built-in sleep function only + supports integer seconds. + + In our build environment, the build failed 3 of 4 times before + this patch. After the patch it failed 0 of 7 times. + +2014-07-07 Holger Weiss + + * NEWS: Add a warning regarding check_snmp + + Tell users that check_snmp might now return CRITICAL in cases where it + used to return OK, and how to deal with that. + + * NEWS: Update version number + + We're going to release version 2.0, not 1.6. + + * plugins/netutils.h: Adjust UNIX_PATH_MAX for BSD + + On at least FreeBSD, NetBSD, OpenBSD, DragonFly, and OS X, this is + hard-coded at 104 bytes. + + Closes #1267. + +2014-07-06 Holger Weiss + + * plugins-scripts/Makefile.am, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_file_age.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_mssql.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_rpc.pl, + plugins-scripts/check_wave.pl: Don't rely on FindBin module to locate + utils.pm + + As the FindBin module doesn't work with ePN, set the path to utils.pm + explicitly at build time. Keep using FindBin additionally, so that the + plugins can also be executed from the build directory. + + Closes #1271. + +2014-07-06 Jan Wagner + + * lib/utils_base.c, lib/utils_base.h, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c: check_icmp/check_dhcp: disable check, if we + are root + + As it is possible to use capabilities(7) on linux or solaris + privileges for example, it is not necessary in all cases to + have those binaries making use of setuid. + +2014-07-06 Holger Weiss + + * NEWS: Add missing entries + + * THANKS.in: Add new authors + + Update the THANKS.in file with the new Git commit authors. + +2014-03-03 abrist + + * plugins/t/check_jabber.t: check_jabber.t - fixed tests for new status + output including hostname + +2014-06-28 Sven Nierlein + + * plugins/t/check_dns.t: tests: added check_dns performance data test + +2014-02-26 abrist + + * plugins/check_dns.c: check_dns.c Added a bit more logic to thresholds + + Added two if elses to cover when only one threshold is set. + +2014-02-26 Jean-Claude Computing + + * plugins/check_dns.c: check_dns: add warning and critical thresholds to + perfdata + +2014-02-20 abrist + + * plugins/check_tcp.c: Cleaned up status output of check_tcp changes + +2014-02-20 Davide Madrisan + + * plugins/check_tcp.c: check_tcp: also display the server addr when + host_specified is set. This will help the admins when multiple checks + are configured + +2014-05-19 abrist + + * plugins/check_nt.c: check_nt.c - Changed 'Mb' to 'MB' in MEMUSE. + +2014-06-23 Spenser Reinhardt + + * lib/utils_cmd.c: lib/utils_cmd.c - Free file descriptor + + Coverity 66502 - File descriptor fd in cmd_file_read is never closed, and thus file is left open after usage throughout runtime. - SR + +2014-06-22 Spenser Reinhardt + + * plugins/negate.c: plugins/negate.c - Function should not return. + + Coverity 66479 - validate_arguments has no need to return anything, as it dies on error, yet was set to return an int. Set to void to resolve warning. + + * plugins/negate.c: plugins/negate.c - Reorder if statement, aiob + + Coverity 66480 - Potential array index out of bounds, since result was not verified to be positive prior to using as an index for state[]. Simply reording the if statement should resolve the issue. - SR + + * plugins-root/check_dhcp.c: plugins-root/check_dhcp.c - array out of + bounds + + Coverity 66488 - offer_packet->options has a max size of 312. It was being used in a loop verifying less than 311, but increasing by 2 per loop, causing a possible array index out of bounds. Changed to checking less than max length - 1. - SR + + * plugins/check_http.c: plugins/check_http.c - leakage fix + + Coverity 66514 - Possible leakage and overflow with addr in redirect functionality. Not confirmed as null terminated, and externally gathered. Restrict string comparisons and duplications by size. - SR + + * plugins/check_ntp.c: plugins/check_ntp.c - Verify struct from response + + Coverity 66524 - req.data is not neccessarily null terminated but still feed to printf statements. This both does that, and verifies the struct more so than before. - SR + +2014-06-05 Spenser Reinhardt + + * plugins/check_real.c: plugins/check_real.c - recv string null + terminate + + Recv into buffer is not properly null terminated prior to strstr and possible other string functions expecting a null termination. Simply take bytes received and use as an index to append \0 after. We are creating buffer[] with size of MAX_INPUT_BUFFER and recv with MAX_INPUT_BUFFER-1 so this should never overflow. + + * plugins/check_apt.c: plugins/check_apt.c - Print uninitialized ereg + + Coverity 66531 - ereg.buffer can be printed without being initialized if do_include and do_exclude are null and critical is an invalid regex. While minor this may leak memory and cause undefined behavior. + +2014-06-05 Eric J. Mislivec + + * plugins/check_tcp.c, plugins/negate.c: Include common.h before any + system headers. + + This should fix some problems building on AIX. + +2014-06-24 Sven Nierlein + + * .travis.yml, plugins/t/NPTest.cache.travis, plugins/t/check_ntp.t, + plugins/t/check_snmp.t, plugins/t/check_udp.t: tests: always build and + test on travis + + also make test is now working on travis-ci + +2014-06-23 Jan Wagner + + * plugins/check_ide_smart.c, po/de.po, po/fr.po, + po/monitoring-plugins.pot: check_ide_smart: Fixing spelling bug + + * plugins/check_mrtg.c, po/de.po, po/fr.po, po/monitoring-plugins.pot: + check_mrtg: Fixing spelling bug + + * plugins/check_dbi.c, plugins/check_ups.c: check_ups/check_dbi: Fixing + spelling bug + +2014-06-23 Holger Weiss + + * NEWS: Add missing entries for the upcoming release + +2014-06-22 Holger Weiss + + * THANKS.in: Add new authors + + Add the new Git commit authors to the THANKS.in file. + + * NEWS: Add missing tab characters + + * plugins/check_radius.c: check_radius.c: Add newline to die() calls + + Our die() function doesn't append a newline character to the message. + + * configure.ac: Change RADIUS library preferences + + Prefer the FreeRADIUS Client library over radiusclient-ng, and prefer + that one over the original radiusclient library. + + * NEWS, REQUIREMENTS, configure.ac, plugins/check_radius.c: + check_radius: Support FreeRADIUS Client library + + Allow for using the FreeRADIUS Client library instead of radiusclient or + radiusclient-ng. The latter two projects are dead. + + Closes #1231. + + * REQUIREMENTS: Update radiusclient-ng URL + + The project was moved to SourceForge.net. + +2014-06-21 Holger Weiss + + * NEWS, lib/tests/test_utils.c, lib/utils_base.c: Add UID to state + retention file path + + Add the UID of the invoking user to the state retention file path. This + helps solving permission issues when different users run the same + plugin. + +2014-06-20 Holger Weiss + + * NEWS: s/MP_STATE_DIRECTORY/MP_STATE_PATH/ + + NAGIOS_PLUGIN_STATE_DIRECTORY was renamed to MP_STATE_PATH, not to + MP_STATE_DIRECTORY. + +2014-06-18 Holger Weiss + + * lib/parse_ini.c: Print proper read error message + + Print a useful error message if opening the configuration file fails. + + * lib/parse_ini.c: Drop privileges for reading file + + Read the configuration file with privileges temporarily dropped if the + code is used by a setuid plugin. + + * lib/parse_ini.c: Add newline to die() calls + + Our die() function doesn't append a newline character to the message. + + * lib/parse_ini.c: Cosmetic change + + Replace an "if" with the ternary operator. + + * gl/Makefile.am, gl/idpriv-droptemp.c, gl/idpriv.h, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, gl/m4/idpriv.m4: Add Gnulib + module "idpriv-droptemp" + + * plugins-scripts/check_file_age.pl, plugins-scripts/check_mssql.pl: Use + FindBin consistently across Perl plugins + + Use Perl's FindBin module to locate the path to utils.pm in + check_file_age.pl and check_mssql.pl, just as we do in other Perl + plugins. + + * plugins/runcmd.c: Remove superfluous newline + + The puts(3) function already appends a newline character to the string. + + * lib/parse_ini.c: Search for INI file in subdirs + + Add two path names to the list of default INI file locations, as some + users/distributions prefer to put configuration files into + subdirectories. + + * lib/parse_ini.c: Add comment on NAGIOS_CONFIG_PATH + + We might want to spit out a warning when NAGIOS_CONFIG_PATH is used. + + While at it, move the function that handles this environment variable to + the bottom. + + * lib/parse_ini.c: Cosmetic changes to comments + + * lib/parse_ini.c: Fix Clang warnings + + * lib/parse_ini.c, lib/parse_ini.h: lib/parse_ini.[ch]: Change code + formatting + + Change the indentation and formatting of the code in lib/parse_ini.c. + This breaks patches against that file and makes it harder to track its + history, but it (hopefully) improves readability a lot. + + * lib/parse_ini.c: Don't cast malloc(3) result + + There's no need to cast malloc(3)'s return value. + + * lib/parse_ini.c: Remove outdated comment and code + + The lib/parse_ini.c:np_get_defaults() function now dies if no + configuration file is found. + + * lib/parse_ini.c: Read $MP_CONFIG_FILE + + Read $MP_CONFIG_FILE if that variable is set in the environment. + + * lib/parse_ini.c: Read "monitoring-plugins.ini" + + Read "monitoring-plugins.ini" if that file exists, but fall back to + reading "plugins.ini" or "nagios-plugins.ini" for backward + compatibility. + + * lib/parse_ini.c, lib/parse_ini.h: lib/parse_ini.[ch]: Simplify code + + Rewrite the code that looks up the INI configuration file path (used by + the Extra-Opts feature) in order to improve readability. The behaviour + should not have changed. + +2014-06-13 Sven Nierlein + + * plugins/tests/check_snmp.t: tests: freebsds snmpd does not use quotes + + when returning syscontact. So make them optional since we want to test + check_snmp and not the snmpd. + + * plugins/tests/check_procs.t: tests: check_proc tests fail if uid -2 + does not map to nobody + + so make sure our tests only run if -2 maps to nobody + + * NPTest.pm, plugins/t/check_fping.t: tests: fping checks require being + root or setuid root + + on the fping binary. Check this before running the test. + + * plugins/tests/check_http.t: require at least HTTP::Daemon 6.01 + + since the test uses send_header from HTTP::Daemon::ClientConn which has been introduced in + HTTP::Daemon 6.01 + +2014-06-12 Sven Nierlein + + * NPTest.pm, plugins/tests/check_http.t: tests: testCmd has own timeout + which overwrites local one + + so add configurable/optional timeout to testCmd. + + * plugins/tests/check_procs.t: tests: parts of the check_procs test only + work when uid -2 exists + + skip those tests if the uid does not exist + +2014-06-12 Holger Weiss + + * configure.ac: Remove unused code + + We no longer set LIBGNUTLS_CONFIG, as GnuTLS no longer ships a + "libgnutls-config" tool. + + * plugins/sslutils.c: Fix compilation with GnuTLS + + GnuTLS doesn't provide a SSL_CTX_check_private_key() function. + + Closes #1254. + +2014-05-17 gcoxmoz + + * plugins/netutils.c: Patch against issue 1062 + + * plugins/netutils.c: Update netutils.c + + Return an encoded state rather than an explicit state if a connection failed. + + * plugins/check_tcp.c: Update check_tcp.c + + Return the state asked for, if connection failed. + +2014-04-21 Gunnar Beutner + + * plugins/check_disk.c: Make check_disk work on Windows. + + * configure.ac, plugins/Makefile.am, plugins/check_users.c: Make + check_users work on Windows. + + * configure.ac, plugins/check_ping.c: Make check_ping work on Windows. + + * configure.ac: Add missing file extensions for some of the plugins. + +2014-03-07 Anton Lofgren + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Handle + SNMPv3 noAuthNoPriv properly + + The SNMPv3 noAuthNoPriv security level, somewhat unintuitively, requires + a security name to be passed along together with the request. Check_snmp + previously did not do this, causing snmpget to throw an error: + + "External command error: No log handling enabled - turning on stderr + logging + snmpget: No securityName specified" + + This patch fixes the issue by always providing the security name when + noAuthNoPriv is specified. + + See also: + https:://bugs.op5.com/view.php?id=8385. + +2014-04-03 Sam Kottler + + * plugins/check_apt.c: Remove the suggestion to run check_apt with + --verbose since it doesn't do anything + +2014-04-04 Holger Weiss + + * AUTHORS: Add Sam Kottler to the list of AUTHORS + +2014-04-04 Jan Wagner + + * THANKS.in, plugins/check_nt.c: check_nt: add UPTIME to perfdata + [sf#3434647] + +2013-10-05 awiddersheim + + * plugins/check_mysql.c: Fix check_mysql.c client options from file + + If you don't specify a group or a file to read data from the plugin tries to read from several files that don't exist and no groups. + +2014-03-20 Sam Kottler + + * plugins-scripts/check_mssql.pl: Update the last remaining instance of + the old FSF address + +2014-03-13 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Add missing newline to --help + output + +2014-03-08 Davide Madrisan + + * lib/Makefile.am, lib/tests/Makefile.am, plugins/Makefile.am: build - + avoid deprecated INCLUDES + +2014-02-28 Holger Weiss + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_wave.pl: Disable Perl's "taint" checks + + Perl's "taint" checks don't like `use lib "$FindBin::Bin"'. + + Cf. http://www.perlmonks.org/?node_id=585299 + +2014-02-28 Jan Wagner + + * .travis.yml: travis-ci: remove mawk build-deps + +2014-02-28 Holger Weiss + + * configure.ac: Remove unused AC_PATH_PROG() calls + + * NEWS, configure.ac, plugins-scripts/Makefile.am, + plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in: Replace + "plugins-scripts/subst.in" foo + + Remove the buggy and complex awk(1) magic in "plugins-scripts/subst.in" + in favor of simple sed(1) substitutions. + + The plugins in the "plugins-scripts" directory now always use the PATH + specified via "./configure --trusted-path", or the default PATH + hard-coded in "configure.ac". + + Fixes #1242. + +2014-02-27 Jan Wagner + + * .travis.yml: travis-ci: Remove gawk to build against mawk + +2014-02-26 Evgeni Golov + + * plugins-scripts/subst.in: subst.in: remove the led() function + + It was only used to replace the 'use lib utils.pm' with the proper + libexec dir, which is now solved by using Perl's FinBin. + + Closes #1241 + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_mailq.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: utils.pm: + use FindBin instead of awk to find the path to + + 'use lib utils.pm' is not valid Perl syntax: + Bareword "utils" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. + Bareword "pm" not allowed while "strict subs" in use at plugins-scripts/check_ircd.pl line 52. + + This makes it impossible to use the plugins directly from the git tree, + e.g. while hacking on them. + + Using FindBin::Bin as the library path allows that, while preserving + the original behaviour of adding the libexec path when the plugin is + properly installed. + +2014-02-27 Jan Wagner + + * NEWS, THANKS.in: NEWS: Adding check_mailq auto detection + +2014-02-27 Evgeni Golov + + * plugins-scripts/check_mailq.pl: check_mailq: add $mailq to check + output, so it is easily visible what was autodetected + + Closes: #1242 + + * plugins-scripts/check_mailq.pl: check_mailq: document autodetection in + the usage output + + * plugins-scripts/check_mailq.pl: check_mailq: try to autodetect which + mailq implementation we are using + + This is done by looking at some common directories and files each + MTA installs on the system. If no known file is found, the old default + sendmail is used. Of course this still can be overridden by -M. + +2014-02-21 Holger Weiss + + * configure.ac: Support --disable-maintainer-mode + + This + + | allows you to choose whether the so called "rebuild rules" should be + | enabled or disabled. With AM_MAINTAINER_MODE([enable]), they are + | enabled by default, otherwise they are disabled by default. In the + | latter case, if you have AM_MAINTAINER_MODE in configure.ac, and run + | `./configure && make', then make will *never* attempt to rebuild + | configure, Makefile.ins, Lex or Yacc outputs, etc. I.e., this + | disables build rules for files that are usually distributed and that + | users should normally not have to update. + | + | The user can override the default setting by passing either + | `--enable-maintainer-mode' or `--disable-maintainer-mode' to + | configure. + | + | People use AM_MAINTAINER_MODE either because they do not want their + | users (or themselves) annoyed by timestamps lossage (see CVS), or + | because they simply can't stand the rebuild rules and prefer running + | maintainer tools explicitly. + + [ https://www.gnu.org/software/automake/manual/automake.html ] + + * configure.ac: Rename configure.in to configure.ac + + The old name has been deprecated years ago. The Autoconf documentation + says: + + | Previous versions of Autoconf promoted the name configure.in, which is + | somewhat ambiguous (the tool needed to process this file is not + | described by its extension), and introduces a slight confusion with + | config.h.in and so on (for which `.in' means "to be processed by + | configure"). Using configure.ac is now preferred. + + [ https://www.gnu.org/software/autoconf/manual/autoconf.html ] + +2014-02-20 Davide Madrisan + + * plugins/check_swap.c: check_swap: Fix the plugin name that appears in + the comment + +2014-02-20 Holger Weiss + + * .travis.yml: travis-ci: Don't use Clang + + Currently, there doesn't seem to be a way to configure Travis CI to omit + the Clang build on the coverity/* branches. + + See: https://github.com/travis-ci/travis-ci/issues/1975 + + * .travis.yml: travis-ci: Adjust "branch_pattern" + + Modify the "branch_pattern" for the Coverity add-on so that it also + matches "coverity/master" and "coverity/maint". + +2014-02-18 Sven Nierlein + + * plugins/tests/check_procs.t: check_procs test fails if there is no + user with uid 501 + + thats because check_procs verifys there is a user for a + given uid filter. So even we use sample data for this + test, we still need a real user. + +2014-02-17 Jan Wagner + + * plugins/check_ssh.c: check_ssh: Reverting a387120 + + This seems to result into more problems in the wild then before 'fixing' it + + Closes Debian #739254 + Reopen Debian #734811 + +2014-02-16 Jan Wagner + + * .travis.yml: travis-ci: remove heading dash accordingly docs + +2014-02-16 Holger Weiss + + * .travis.yml: travis-ci: Cosmetic changes + + Use two spaces for indentation. + + * .travis.yml: travis-ci: Enable email notifications + + Have Travis CI send build failure and recovery notifications to the + team@ list. + +2014-02-16 Jan Wagner + + * .travis.yml: travis-ci: Add configuration for Coverity Scan + + Run Coverity Scan builds on Travis CI, but only when pushing into the + "coverity" branch. + + * .travis.yml: travis-ci: Make use of before_script target + + * .travis.yml: travis-ci: Update package list in before_install + [skip ci] + + * .travis.yml: travis-ci: Move all into install target + + just keeped 'make' in script target + + * .travis.yml: travis-ci: Add clang and gcc as compiler + +2014-02-15 Jan Wagner + + * .travis.yml: travis-ci: Enable IRC notification + +2014-02-14 Jan Wagner + + * .travis.yml: Add travis config + +2014-02-07 Sam Kottler + + * plugins/Makefile.am: Remove unnecessary whitespace in Makefile.am + +2014-01-31 Thomas Guyot-Sionnest + + * plugins/tests/check_procs.t: Add perfdata in check_proc output tests + + * plugins/tests/check_snmp.t: Fix snmpd tests + + * NPTest.pm, plugins/tests/check_procs.t, test.pl.in: Enable tests in + tests/ subdirs + +2013-11-15 Stephane Lapie + + * lib/utils_base.h, plugins/check_snmp.c: Handle negative values + properly with check_snmp + + check_snmp becomes capable of evaluating negative values properly, + but it might be returning CRITICALs where it used to return OK and was ignored, + if a negative value turns out to actually be a valid value. + If negative values are valid, this can be worked around, + by adding "~:" to the warning/critical threshold : 100 -> ~:100 + +2014-01-31 Thomas Guyot-Sionnest + + * plugins/tests/check_snmp.t, plugins/tests/check_snmp_agent.pl: Add + tests for negative thresholds in check_snmp + + Next commit will work on fixing these! + + * lib/tests/test_utils.c: Add tests for negative thresholds in + test_utils + +2014-01-30 Holger Weiss + + * plugins/check_dig.c: check_dig: Declare variable at the top + + C89 doesn't allow variable declarations to be intermingled with code. + +2014-01-30 Jan Wagner + + * plugins/check_dig.c: check_dig: stick with integer devision + + This change saves us from having to link check_dig against "libm" + + * plugins/check_dig.c: check_dig: timeout_interval is a global variable + which is already set to 10 seconds + + * THANKS.in, plugins/check_dig.c: check_dig: patch to make dig honor -t + option + + When a timeout value is specified with the -t option, dig will sometimes + timeout before the timer is actually reached. + + The problem occurs because the check_dig plugin does not pass the specified + timeout value to dig, leaving dig to timeout with it's default value which + seems to be around 10-15seconds. + + To reproduce: + time ./check_dig -H 127.0.0.2 -l www.google.com -t 30 + + It will not run for 30secs, which is the expected behaviour. + + The following will work, because the timeout is less than the default dig + timeout, so the plugin cancels the dig command: + time ./check_dig -H 127.0.0.2 -l www.google.com -t 2 + + This fix passes the timeout value to dig, and sets the number of retries which tends to vary from system to system by default. + + Closes #1168 + +2014-01-29 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Add tests for mp_translate_state() + +2013-10-01 Jan Wagner + + * THANKS.in, plugins-scripts/check_mailq.pl: check_mailq: adding + nullmailer support + + Adding nullmailer support to check_mailq submitted by Luca Corti + + Closes: #740 + Closes: #1189 + +2014-01-29 Jan Wagner + + * plugins-scripts/check_mailq.pl: Just fixing small typo in comment + +2014-01-29 Thomas Guyot-Sionnest + + * plugins/check_swap.c: Update check_swap usage + + * .gitignore: AUpdate .gitignore for new gnulib module + + * NEWS, plugins/check_swap.c: check_swap: add supports for a + configurable state when there is no swap + + Check_swap used to allow no swap when thresholds were only specified in + percent. This is no longer the case and the state now must be specified + explicitly. The default is to always return CRITICAL when the swap is + absent regardless of thresholds. + + * lib/utils_base.c, lib/utils_base.h, plugins/negate.c: Move negate' + translate_state() to utils_base.h mp_translate_state() + + Also use strcasecmp imported from gnulib for simplicity + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/strcase.m4, gl/m4/strings_h.m4, gl/strcasecmp.c, gl/strings.in.h, + gl/strncasecmp.c: Add strcase gnulib module + + * plugins/t/negate.t: Typo + + * plugins/check_swap.c: Fix check_swap returning OK on & thresholds and + no swap + + Return 0% free instead of 100% free when total swap is 0 + +2013-09-30 Jan Wagner + + * plugins/check_disk.c: check_disk: precise the help output + + Clarifying in the help output that we need either a device or mount point + listed by the mount(8) command. + + (Closes: #1118) + (Closes: #1170) + +2014-01-28 Thomas Guyot-Sionnest + + * plugins/t/check_mysql.t: Clarify check_mysql test prompts + + Also default to "-u test -ptest" which are default MySQL accounts only + missing the prescribed privileges. + + The database is no longer specified as it is not used. + If wanted is should be its own parameter/tests. + +2014-01-27 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_dig.c: check_dig: fix wrong IPv6 + arguments order + + * lib/tests/test_utils.c, lib/utils_base.c, plugins/tests/check_snmp.t: + Rename MP_STATE_DIRECTORY to MP_STATE_PATH + + * NEWS, lib/utils_base.c: And release notes for previous change + (MP_STATE_DIRECTORY) + + The change has also been updated in + https://www.monitoring-plugins.org/doc/state-retention.html + +2014-01-26 Thomas Guyot-Sionnest + + * NPTest.pm: Fix tests with an empty NPTest.cache file + + The NPTest.cache cannot be loaded when empty, and this prevents + getting the data and populating the file. This patch skips the file when + empty as if it didn't exist. + +2014-01-25 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h: Ignore + MP_STATE_DIRECTORY in suid plugins + + If a plugin still has suid privileges at the time np_enable_state() is + called, the MP_STATE_DIRECTORY environment will be ignored. + + There is no need for a NEWS entry as no suid plugins use np_enable_state + yet. + + * lib/parse_ini.c: Clean up parse_ini error messages, add missing + newlines + + * lib/tests/test_utils.c, lib/utils_base.c, plugins/tests/check_snmp.t: + Rename ENV variable, keep backward compatibility + + Rename NAGIOS_PLUGIN_STATE_DIRECTORY to MP_STATE_DIRECTORY + +2013-10-01 Jan Wagner + + * plugins-scripts/check_file_age.pl, plugins-scripts/t/check_file_age.t: + check_file_age: support for --ignore-missing + + Patch to provide for a -i | --ignore-missing option. This allows files that + don't exist to be monitored for without causing an error. The use case is: + + * one process periodically pushes files to an "input" queue for a second + process + * the second process, when running cleanly will "consume" (process and remove) + these files + + So the conditions to meet are: + 1. If the file doesn't exist, that's fine (OK) + 2. If the file exists, but is less than X seconds, that's fine (OK) + 3. If the file exists, but greater than X seconds, no good (CRITICAL) + + Since now check_file_age doesn't permit this behavior, as a non-existent file + is considered CRITICAL. + + Test case was contributed by our lovely Holger. + + Closes #1181, Closes #989, Closes #862, Closes #1187, Closes #845 + Closes Debian Bug #496307 + +2014-01-24 Jan Wagner + + * THANKS.in, plugins/check_ping.c: check_ping: Fixing "time of day goes + back" + by Geoff Oakham + + Patch of check_ping that allows it to gracefully handle when ping outputs + to stderr "Warning: time of day goes back (-XXXXus), taking countermeasures." + + Closes: #809 and #1195 + + * plugins/check_ntp.c, plugins/check_ntp_time.c: Fixing bug in average + calculation (Submitted by Lars) + + The more important change: A fix for a bug which caused the check_ntp_time + and check_ntp_time check to always take the first response from ntp and not + the avarage since "j" is not increased anywhere. "i" should be used there + instead. + + Partly Closes #956 and Closes #1166 + Closes: #1089 + + * plugins/check_ntp.c, plugins/check_ntp_time.c: Making AVG_NUM + configurable by compiler define (Submitted by Lars) + + A minor change which makes the AVG_NUM configurable by compiler define. + Partly Closed #956 and Closes #1166 + +2014-01-24 Thomas Guyot-Sionnest + + * lib/parse_ini.c: Use access() instead of stat() in parse_ini.c + + * lib/tests/test_base64.t, lib/tests/test_cmd.t, lib/tests/test_disk.t, + lib/tests/test_ini1.t, lib/tests/test_ini3.t, lib/tests/test_opts1.t, + lib/tests/test_opts2.t, lib/tests/test_opts3.t, lib/tests/test_tcp.t, + lib/tests/test_utils.t: Update comments + + 1. libtab is now bundled, so suggest to enable it rather than install it + 2. "parse-ini" feature has been called "extra-opts" + +2014-01-23 Thomas Guyot-Sionnest + + * plugins-scripts/Makefile.am, plugins-scripts/check_ntp.pl: Remove + obsolete check_ntp.pl + +2011-10-25 Tilmann Bubeck + + * plugins/check_ide_smart.c: fix smart attribute comparison + + Each S.M.A.R.T. attribute is compared against a threshold. If it is LESSTHAN + that threshold an error is reported. This patch fixes the problem, that + attribute values EQUAL to the threshold are reported as error, which is wrong. + Only LESSTHAN the threshold is an error. + + For more information see: http://www.hdsentinel.com/smart/index.php + + My SSD has some attributes which value and threshold are "0". Without the patch + this is reported as errornous. + + ID# ATTRIBUTE_NAME FLAG VALUE WORST THRESH TYPE UPDATED WHEN_FAILED RAW_VALUE + ... + 172 Unknown_Attribute 0x0032 000 000 000 Old_age Always - 0 + 174 Unknown_Attribute 0x0030 000 000 000 Old_age Offline - 13 + 177 Wear_Leveling_Count 0x0000 000 000 000 Old_age Offline - 0 + ... + + See also: + + * http://sourceforge.net/p/nagiosplug/patches/365/ + * https://bugzilla.redhat.com/913085 + +2014-01-23 Thomas Guyot-Sionnest + + * NEWS, configure.in: Enable extra-opts by default + + * plugins/check_ide_smart.c: Fix misleading option text + + As soon as a device is specified without using -d, anything else on the + command line is ignored. + + * NEWS, plugins/check_ide_smart.c: Disable SMART test commands in + check_ide_smart + + check_ide_smart could disable offline auto tests but could not re-enable + them. For this reason all SMART command modes have been disabled + + The disabled commands are -0/--auto-off, -1/--auto-on and + -i/--immediate + + * plugins/utils.h: Remove accidental tabs inserted in macro + + * NEWS, plugins/check_ide_smart.c: Make check_ide_smart default to + nagios output + + check_ide_smart was originally a smard control utility later converted + to a monitoring plugin. the -n option (Nagios check) should therefore be + the default. + + This patch deprecates the -n and -q switches, and make the other + switches return nagios-compatible output (they are most likely used in + eventhandlers, but returning nagios-compatible output makes it clear and + easy to handle the return status) + +2014-01-22 Ricardo Maraschini + + * plugins/utils.h: avoiding warnings on empty printf statements + + while compiling i keep receiving an warning statement as follow: + + warning: zero-length gnu_printf format string + + using an unorthodox method to remove them + +2014-01-22 Lars Vogdt + + * plugins-scripts/check_file_age.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_mailq.pl: fix + outdated Free Software Foundation address + +2014-01-21 Holger Weiss + + * README: Minor fixes regarding new project name + + Talk about "monitoring systems", not just about "Nagios". Also, the + default installation prefix has changed to /usr/local. + + (While at it, wrap lines consistently at 76 characters.) + + * configure.in, lib/utils_base.h, lib/utils_cmd.h, + pkg/solaris/pkginfo.in, plugins-root/check_icmp.c, + plugins-scripts/utils.pm.in, plugins/utils.h, po/de.po, po/fr.po, + po/monitoring-plugins.pot, tools/tango: Capitalize "Monitoring Plugins" + + "Monitoring Plugins" is a name. + + * configure.in, plugins/tests/var/ps_axwo.debian: New default + installation prefix: /usr/local + + Install into /usr/local instead of /usr/local/nagios by default, in + order to comply with the Filesystem Hierarchy Standard (FHS) and + presumably the expectations of most users. + +2014-01-20 Spenser Reinhardt + + * plugins/check_apt.c, plugins/check_disk.c, plugins/check_procs.c, + plugins/negate.c: plugins/*.c: Non-network timeout changes + + Changes to non-network checks for clarity on timeout value. Adapted from pull request #1209 tracker from user awiddersheim. (Closes: #1209) + Files: check_apt.c, check_disk.c, check_procs.c, negate.c + + * plugins/utils.h: Addition of plugin timeout msg. + + Addition of timeout message for non-network plugins(UT_PLUG_TIMEOUT), and alteration of UT_TIMEOUT to UT_CONN_TIMEOUT for networked checks. Alteration of pull request #1209 tracker by user awiddersheim. + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_game.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_ups.c, plugins/negate.c: plugins/*.c: Alterations for + timeout messages. + + .c file changes for misleading timeout messages in help functions. Solution to pull request #1209 tracker by awiddersheim. + + Files: plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, plugins/check_game.c, plugins/check_http.c, plugins/check_ldap.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, plugins/negate.c + +2014-01-21 Jan Wagner + + * plugins/check_mysql_query.c: Revert renaming value + + As suggested by sreinhardt in 045d38a6 over there in nagios-plugins + +2013-10-14 awiddersheim + + * plugins/check_mysql_query.c: Add performance data to + check_mysql_query.c (Closes: #1202) + +2014-01-20 Thomas Guyot-Sionnest + + * NPTest.pm: Fix NPTest.pm not asking for unconfigured variables + + It appeats STDERR isn't a tty anymore during tests, but since we type + from tty to STDIN it should be bound to our tty (and works for me). + +2014-01-20 Sven Nierlein + + * perlmods/Monitoring-Plugin-0.37.tar.gz, + perlmods/Nagios-Plugin-0.36.tar.gz: updated perldod with a renamed pkg + +2014-01-20 Holger Weiss + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: Capitalize "Monitoring" when it's + the first word + + * lib/extra_opts.c, lib/parse_ini.c, plugins/check_radius.c, + plugins/t/check_http.t, plugins/urlize.c, tools/distclean: Minor fixes + to be amended into "rename" commit + +2014-01-19 Thomas Guyot-Sionnest + + * po/fr.po: Minor mailinglist corrections for french + + * po/Makevars, po/de.po, po/fr.po, po/monitoring-plugins.pot: Reprocess + L10n files + +2014-01-18 Monitoring Plugins Development Team + + * .gitignore, ACKNOWLEDGEMENTS, AUTHORS, CODING, FAQ, Makefile.am, NEWS, + NPTest.pm, README, REQUIREMENTS, SUPPORT, configure.in, doc/LEAVERS, + doc/NEW_STARTERS, doc/RELEASING, doc/developer-guidelines.sgml, + lib/Makefile.am, lib/extra_opts.c, lib/extra_opts.h, lib/parse_ini.c, + lib/parse_ini.h, lib/tests/Makefile.am, lib/tests/test_utils.c, + lib/utils_base.c, lib/utils_base.h, lib/utils_cmd.c, lib/utils_cmd.h, + lib/utils_disk.c, lib/utils_tcp.c, m4/np_mysqlclient.m4, + monitoring-plugins.spec.in, perlmods/install_order, + pkg/solaris/pkginfo.in, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mssql.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/utils.pm.in, + plugins/Makefile.am, plugins/check_apt.c, plugins/check_by_ssh.c, + plugins/check_cluster.c, plugins/check_dbi.c, plugins/check_dig.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/negate.c, plugins/netutils.c, + plugins/netutils.h, plugins/popen.c, plugins/runcmd.c, plugins/runcmd.h, + plugins/sslutils.c, plugins/t/check_disk.t, plugins/t/check_dns.t, + plugins/t/check_http.t, plugins/tests/check_http.t, + plugins/tests/var/ps_axwo.debian, plugins/urlize.c, plugins/utils.c, + plugins/utils.h, po/Makevars, po/de.po, po/fr.po, + po/monitoring-plugins.pot, tools/distclean, tools/generate-change-log, + tools/git-notify, tools/git-post-receive-hook, tools/tango, + tools/tinderbox_build: Project rename initial commit. + + This is an initial take at renaming the project to Monitoring Plugins. + It's not expected to be fully complete, and it is expected to break + things (The perl module for instance). More testing will be required + before this goes mainline. + +2014-01-13 Holger Weiss + + * NEWS, plugins-scripts/check_log.sh, plugins-scripts/utils.sh.in: + utils.sh: Don't define $ECHO + + In utils.sh, $ECHO was set to printf(1) or echo(1), depending on whether + printf(1) is available in /usr/bin. This resulted in various bugs, as + printf(1) cannot be used in the same way as echo(1). + + Thanks to Trevor Hemsley for reporting one of those bugs: If $ECHO was + set to printf(1), check_log stumbled when reporting a log line with a + "%" character. + +2014-01-10 Jan Wagner + + * plugins/check_ssh.c: check_ssh: Get rid of sshd: Read from socket + failed: Connection reset by peer + + This fix was grabbed from FreeBSD downstream and provided by Dmitry Sivachenko. + Fixes Debian Bug #734811 + +2014-01-10 Holger Weiss + + * configure.in: Call AC_CONFIG_HEADERS + + AM_CONFIG_HEADER is deprecated. + +2013-12-27 Sven Nierlein + + * plugins/t/check_http.t, plugins/t/check_tcp.t: fixed tests when there + is no direct internet connection + + - check http had wrong number of skipped tests + - check tcp did not use the 'no internet' flag at all + +2013-12-20 Holger Weiss + + * NEWS: Mention fix for check_http's -S option + + Closes #1220. + +2013-12-20 Joseph Gooch + + * plugins/check_http.c: Fix for SSL Versioning when multiple options are + used. + + If you specify -S1 -C 30... The -C option will reset the ssl_version to 0. This is not a good thing. + + Instead we set the default to 0 and retain the version when later args are passed. + +2013-12-16 Damian Myerscough + + * nagios-plugins.spec.in: Fix #1217 spec file fails to build due to + duplicate files and unused files + +2013-12-05 Holger Weiss + + * plugins/check_http.c: check_http: Don't let "-N" expect an argument + + Fix the problem that check_http's "-N" option expects an argument + although it shouldn't. The corresponding long option ("--no-body") + wasn't affected. + + This error was introduced in ee3c4014d511e105489b081390636cacd4c53e3f. + Thanks to Kerry Hughes for reporting it on the devel@ list. + +2013-11-20 Sven Nierlein + + * plugins/t/check_procs.t: make testing check_proc not rely on bash + + also grandparents make this test fail but is not a problem in real live. + NPTest->testCmd uses "sh -c" already, so there is no need to do that twice. + +2013-11-20 Holger Weiss + + * NEWS: Add WARNING regarding the check_procs change + + Closes #1205. + +2013-10-18 Anton Lofgren + + * plugins/check_procs.c, plugins/t/check_procs.t: check_procs: ignore + plugin parent process + + This fixes an issue that appears when running check_procs over NRPE, + where the default shell is configured to (for example) dash, as is the + case on Debian. + + dash (and tcsh, and mksh, and probably others), when invoked with -c forks an additional process + to execute the argument string. Contrast this with bash, which does not + do this, provided that the argument string simply can be exec()'d as-is. + + To demonstrate: + $ bash -c pstree + init─┬ .. + ... + ├─sshd─-─sshd───pstree + + versus + $ dash -c pstree + init─┬ .. + ... + ├─sshd─-─sshd───dash───pstree + + The consequence of this fork is that the following invocation: + /opt/plugins/check_procs -a init + + will result in this output: + + PROCS OK: 2 processes with args 'init' | processes=2;;;0; + + because the check_procs, in addition to finding the actual init process, + finds its parent shell as well. + + This example is a bit contrived, but I think it illustrates the + point. + + This wouldn't really be a problem, and normally isn't, if it weren't + for the fact that NRPE uses a call to popen() which does exactly the + above (executes '/bin/sh -c ...'), causing inconsistent behaviour + between distributions and much confusion for end users. + + The argument may be made that the dash process spawned by NRPE is just a + process like any other, and should therefore be included in the process + count just like any other. However, this is not very intuitive, because + of the previously mentioned inconsistencies. + + The argument might also well be made that we're _never_ interested in the + immediate ancestor of the plugin, and while it is unknown how many + installations have already made the necessary modifications to their + setups to make up for the fact that the plugin behaves the way it does, + it is not deemed worthwhile to entertain such workarounds. + + Thus, this patch ignores the parent process. + + See also these bug reports: + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626913 + http://sourceforge.net/p/nagiosplug/bugs/512/ + https://github.com/nagios-plugins/nagios-plugins/issues/999 + https://bugs.op5.com/view.php?id=4398 + +2013-11-05 Holger Weiss + + * README: Change GitHub URL + + Link to our main project home page on GitHub instead of referencing only + the "nagios-plugins.git" repository. (And put the URL on its own line.) + + * README: Clarify license notice + + Note that we permit redistribution and modification under the terms of + future GPL versions, and state the exclusion of warranty. This is in + accordance with the license notices at the top of our source files. + +2013-10-28 Holger Weiss + + * FAQ, README, SUPPORT, configure.in, nagios-plugins.spec.in, + pkg/solaris/pkginfo.in, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_mssql.pl, plugins/check_apt.c, + plugins/check_by_ssh.c, plugins/check_cluster.c, plugins/check_dbi.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.h, po/Makevars, + po/de.po, po/fr.po, po/nagios-plugins.pot: Update URLs and mailing list + addresses + + Now that we moved our infrastructure away from SourceForge, update the + URLs and mailing list addresses accordingly. + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Fix URL + + Fix the Test::Simple tutorial URL. + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Remove + Tinderbox link + + We don't run a Tinderbox instance anymore. (Noted by "zathras" on IRC.) + +2013-10-22 awiddersheim + + * configure.in, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_file_age.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in: Fix trusted + path + + When configuring the plugins you have the option to specify a trusted path with --with-trusted-path. This option seems to have been deprecated at some point for unknown reasons and had typically had no affect. This commit makes this option work again for those who have a desire to use it. There should be no affect on those who have not chosen to specify a trusted path. + +2013-10-22 Jan Wagner + + * plugins-scripts/check_oracle.sh: Just using the posix conform extended + regular expression grep + + * plugins-scripts/check_oracle.sh: check_oracle: --db +ASM bad string + matching + check_oracle doesn't correctly check for pmon +ASM instance from at least Oracle 11 as the pmon proces was renamed from ora_pmon_.* to asm_pmon_.*. + -- + Just turning attached patch of github issue #1207 into a push request. + (Closes #1207) + +2013-10-08 Holger Weiss + + * plugins/utils.h: Update web site URLs + + The Nagios Plugin Development Guidelines and the Extra-Opts + documentation were moved to our new project server. + +2013-10-05 awiddersheim + + * plugins/check_mysql_query.c: Add additional usage data for new options + in check_mysql_query.c + + * plugins/check_mysql_query.c: Add ability to read from options file to + check_mysql_query.c + + This is the same code that was added to check_mysql.c in 5ed7194. + +2013-10-03 Holger Weiss + + * NEWS: Mention "contrib" removal + + Add a note regarding the removal of the "contrib" directory to the NEWS + file. This note is missing from the NEWS file shipped with the 1.5 + release, though. + +2013-10-02 Holger Weiß + + * NEWS, NP-VERSION-GEN, configure.in: Prepare for the 1.5 release + +2013-10-02 Holger Weiss + + * FAQ: Update CVS references + + We moved from CVS to Git. + +2013-10-02 Jan Wagner + + * doc/LEAVERS, doc/NEW_STARTERS, tools/README: tools: Update CVS + references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + + * doc/LEAVERS, doc/NEW_STARTERS: doc: Updated CVS references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + +2013-10-02 Holger Weiss + + * README: Update URLs + + We moved the Nagios Plugins site from SourceForge to our project server. + + * SUPPORT: Update CVS/SourceForge references + + We moved our stuff from CVS/SourceForge to Git/GitHub. + +2013-10-01 Jan Wagner + + * plugins/check_ssh.c: check_ssh: check protocol + + It would be useful to be able to detect the protocols supported by the remote + ssh server to locate any using the insecure ssh v1 protocol. This patch + attempts to match against the protocol string in the ssh response. + + Example: + + check_ssh -H my.host.com -P 2.0 + -- + Just turning attached patch of github issue #780 into a push request. + (Closes #780) + +2013-09-30 Holger Weiss + + * THANKS.in: Update THANKS file + + Add all new Git commit authors to the THANKS.in file. + + * AUTHORS: Tiny cosmetic change + + * AUTHORS: Add Jan Wagner to the list of AUTHORS + + * AUTHORS: Add Eric Stanley to the list of AUTHORS + +2013-09-29 Holger Weiss + + * plugins/t/check_dig.t, plugins/t/check_http.t: Change default host + names for some tests + + Testing "nagiosplugins.org" will currently not work. + +2013-09-28 Holger Weiss + + * .gitignore, ChangeLog, Makefile.am, tools/generate-change-log: Add + tools/generate-change-log + + Add the tools/generate-change-log script for auto-generating the + ChangeLog file from the Git history when running "make dist". + +2013-09-27 Holger Weiss + + * tools/mail_error, tools/np_build_from_sf, tools/sfsnapshot, + tools/sfsnapshot-upload, tools/sfsnapshotgit, tools/sfupload, + tools/sfwebcron, tools/sync_website, tools/update_man_pages: tools: + Remove Drupal/SourceForge scripts + + We moved our web site away from Drupal and the snapshots/guidelines away + from SourceForge. The new infrastructure scripts will be maintained in + a separate repository together with the Markdown source of the new web + site. + + * tools/git2svn.pl: Remove tools/git2svn.pl + + We no longer mirror out Git repositories into Subversion. + +2013-09-26 awiddersheim + + * plugins/check_http.c: Die on SSL initialization errors + + Fixes issue where if an SSL initialization error occurs on a redirect + using -f follow the plugin still returns an OK state. + + Closes #1159. + +2013-09-25 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Normalize + spelling + + - Write "plugin" instead of "plug-in". + - Write "development guidelines" instead of "developer guidelines" + - Capitalize "Nagios Plugin Development Guidelines". + +2013-09-22 Holger Weiss + + * README: Minor cosmetic change + +2013-09-20 Holger Weiss + + * README: Apply another few cosmetic changes + + * README.md: Add symlink: README.md -> README + + Add a symlink so that GitHub renders the README file as Markdown. + + * README: Use code blocks for commands + + * BUGS, Makefile.am, README: Remove the BUGS file + + The BUGS file wasn't maintained properly anymore. And doing so makes no + sense. That's what the bug tracker is for. + + * README: Convert to Markdown and apply cleanups + + Use the Markdown format for the README file and apply various minor + cosmetic changes. + + * README: Remove outdated information + +2013-09-19 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Don't exit UNKNOWN instead of OK + + Since commit 912df3ef9b188c82893dace1e9b56c42a558fdba, check_pgsql + exited UNKNOWN instead of OK if the new --query option was *not* + specified. This bug is fixed now. + +2013-09-18 Sven Nierlein + + * NPTest.pm: tests: only write cache file if it changed + + Tests sometimes fila when running multiple parallel tests using the + same cache file because it is written everytime a test parameter + is read. Since there is no locking, this might fail from time to time. + +2013-09-17 Sven Nierlein + + * plugins/t/check_disk.t: check_disk: die with a reasonable error + message if one mount point hits average value + + * plugins-root/check_dhcp.c: check_dhcp: fix mac address and interface + number detection on solaris + + newer (or x86) solaris implementations have interface names like e1000g0 + which includes numbers. So we reverse the interface number detection to + get the last number, instead of the first number. + + * plugins-root/t/check_dhcp.t: check_dhcp: fix tests interface detection + + * plugins/t/check_ssh.t: check_ssh: added test case + + * plugins/t/check_by_ssh.t: check_by_ssh: tests expand key and config + path + + some systems do not expand the path automatically. + + * plugins/t/check_udp.t: check_udp: skip tests which rely on udp listen + + solaris netcat does not listen in udp mode due to + http://sourceforge.net/p/netcat/bugs/27/ + +2013-09-17 Sven Nierlein + + * plugins-scripts/t/check_disk_smb.t: check_disk_smb: fixed number of + tests to skip + +2013-09-16 Sven Nierlein + + * plugins/check_disk.c: check_disk: get_fs_usage hasn't been run if + using groups + + the reason why it still worked sometimes was fsu_blocks beeing uninitialized + which resulted in a true test sometimes. + + * plugins-scripts/check_disk_smb.pl: check_disk_smb: verify path to + smbclient + + * plugins/t/check_procs.t: check_procs: fix test with sleeping processes + + at least on freebsd, there are a processes with state 'S', they always + use two character status. + + * plugins/t/check_http.t: check_http: tests use supplied value if + possible + + * plugins-root/t/check_dhcp.t: check_dhcp: fix tests for machines with + default interace != eth0 + +2013-09-16 Sven Nierlein + + * NPTest.pm: tests: don't skip utils test + + * plugins-root/t/check_dhcp.t: check_dhcp test: skip subtests if no + variable is set + +2013-09-15 Sven Nierlein + + * plugins-root/t/check_dhcp.t: check_dhcp: add test file + + * plugins-root/t/check_icmp.t: check_icmp: tests do not require sudo if + run by root + + * plugins-root/Makefile.am: plugins-root: include t folder in release + tarball + +2013-09-15 Sven Nierlein + + * plugins/check_tcp.c: check_tcp: use receive timeout for checks that + expect response + + if check_imap expects a string that never occurs, it currently waits forever + because thats how the imap protocoll works. Use a receive timeout in that case + so we can exit early with a proper error message. + +2013-09-14 Sven Nierlein + + * plugins/t/check_ping.t: check_ping: increase test timeout + + freebsds ping takes a few seconds till it returns, so a 1 second timeout does + not work for the test. + + * plugins/check_load.c: check_load: add alternative uptime syntax + + check_load parses load from the uptime command if no proc filesystem is available. Seems + like there are at least 2 different uptime outputs. + + linux: + 20:44:34 up 25 days, 2:07, 13 users, load average: 0.13, 0.17, 0.22 + + freebsd 8: + 8:44PM up 4:29, 1 user, load averages: 0.00, 0.00, 0.00 + +2013-09-14 Sven Nierlein + + * plugins/t/check_udp.t: check_udp: try nc.traditional too + + nc.traditional is available on (at least) ubuntu systems and uses traditional nc syntax + +2013-09-14 Sven Nierlein + + * NPTest.pm, plugins/t/check_dig.t, plugins/t/check_tcp.t: tests: move + ipv6 detection into NPTest module + +2013-09-13 Sven Nierlein + + * plugins/t/check_udp.t: unified nc syntax + + older netcats do not understand -p, they expect host and port as additional argument. + This is backwards compatibel to newer clients. Also support netcat instead of nc. + + * plugins/check_fping.c: fping: some fping versions set loss to 0% by + mistake + + fping v2.4b2 returns + 10.99.0.1 : xmt/rcv/%loss = 0/0/0% + for a failed host, so we assume the host is down if xmt is zero + + * NPTest.pm: NPTest: ensure all systems use same amount of whitespace + +2013-09-12 Sven Nierlein + + * plugins/check_snmp.c: check_snmp: add timeout handler befor running + snmpget + + * plugins/t/check_tcp.t: check_tcp: only test ipv6 if ping6 works + + * NPTest.pm: tests: sort cached settings before save + + * NPTest.pm: tests: make sure tests don't hang + +2013-09-12 Holger Weiss + + * plugins/check_tcp.c: check_tcp: Fix checks without --expect string + + Commit e8044713d41f5ef1d9ce814df4a079d8f92306b0 broke check_tcp checks + without --expect string, this commit fixes that regression. + + * lib/tests/test_tcp.c, lib/utils_tcp.c: Minor cosmetic changes + + * lib/tests/test_tcp.c, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: check_tcp: Properly deal will partial recv(3)s + + The np_expect_match() function now returns one of three possible states + instead of just TRUE or FALSE: + + - NP_MATCH_SUCCESS + - NP_MATCH_FAILURE + - NP_MATCH_RETRY + + The NP_MATCH_RETRY state indicates that matching might succeed if + np_expect_match() is called with a longer input string. This allows + check_tcp to decide whether it makes sense to wait for additional data + from the server. + + * lib/tests/test_tcp.c, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: Improve interface of np_expect_match() function + + Replace the three boolean parameters of lib/utils_tcp.c's + np_expect_match() function with a single "flags" parameter. + +2013-09-10 Holger Weiss + + * plugins/sslutils.c: Don't mark SSL_METHOD variable as "const" + + The SSL_CTX_new(3) function expects a non-"const" SSL_METHOD value. + + * plugins/netutils.c, plugins/netutils.h, plugins/sslutils.c, + plugins/utils.c, plugins/utils.h: Move global variables from .h to .c + files + + Simplify things by moving the definition of global variables into .c + files, where they belong. + + * lib/utils_base.c, plugins/check_ide_smart.c, plugins/check_tcp.c, + plugins/negate.c, plugins/runcmd.h: Fix GCC's + -Wimplicit-function-declaration warnings + + Fix the issues found by GCC when the -Wimplicit-function-declaration + flag is specified. + + * lib/tests/test_disk.c, plugins/check_http.c, plugins/check_procs.c: + Fix GCC's -Wuninitialized warnings + + Fix the issues found by GCC when the -Wuninitialized flag is specified. + +2013-09-10 juliopedreira + + * plugins/check_tcp.c: check_tcp: Don't close connection too early + + Closing the connection because the bytes received are less than the + buffer size assumes that all the bytes will be received in one go. This + is not always true! + +2013-09-10 Holger Weiss + + * NEWS, plugins/check_http.c: + s/--proxy_authorization/--proxy-authorization/ + + The check_http option "--proxy_authorization" is now called + "--proxy-authorization" instead. It was always documented this way, and + we don't usually use underscores in option names. + +2013-09-05 Holger Weiss + + * plugins/check_snmp.c: check_snmp: Initialize size_t value to 0, not + NULL + + * build-aux/ltmain.sh, gl/m4/libtool.m4, gl/m4/ltoptions.m4, + gl/m4/ltversion.m4, gl/m4/lt~obsolete.m4: Update bundled libtool files + + Import the current libtool version 2.4.2. + +2013-09-04 Holger Weiss + + * plugins-root/check_icmp.c: check_icmp: Minor whitespace/indentation + fixes + + * plugins-root/check_icmp.c: check_icmp: Support "--help" and + "--version" + + Let check_icmp provide "--help" and "--version" flags (in addition to + "-h" and "-V"), just as the other plugins do. + +2013-09-02 Holger Weiss + + * Makefile.am, contrib-reporting/process_perfdata.pl, + contrib/README.TXT, contrib/aix/check_failed, contrib/aix/check_io, + contrib/aix/check_kerberos, contrib/aix/check_queue, + contrib/aix/pg_stat, contrib/check_adptraid.sh, contrib/check_apache.pl, + contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_arping.pl, contrib/check_asterisk.pl, + contrib/check_axis.sh, contrib/check_backup.pl, + contrib/check_bgpstate.pl, contrib/check_breeze.pl, + contrib/check_cluster.c, contrib/check_cluster2.README, + contrib/check_cluster2.c, contrib/check_compaq_insight.pl, + contrib/check_cpqarray.c, contrib/check_digitemp.pl, + contrib/check_dlswcircuit.pl, contrib/check_dns_random.pl, + contrib/check_email_loop.pl, contrib/check_fan_cpq_present, + contrib/check_fan_fsc_present, contrib/check_flexlm.pl, + contrib/check_frontpage, contrib/check_hltherm.c, + contrib/check_hprsc.pl, contrib/check_hw.sh, + contrib/check_ica_master_browser.pl, + contrib/check_ica_metaframe_pub_apps.pl, + contrib/check_ica_program_neigbourhood.pl, + contrib/check_inodes-freebsd.pl, contrib/check_inodes.pl, + contrib/check_ipxping.c, contrib/check_javaproc.pl, + contrib/check_joy.sh, contrib/check_linux_raid.pl, + contrib/check_lmmon.pl, contrib/check_log2.pl, contrib/check_lotus.pl, + contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, + contrib/check_mem.pl, contrib/check_ms_spooler.pl, + contrib/check_mssql.sh, contrib/check_nagios.pl, + contrib/check_nagios_db.pl, contrib/check_nagios_db_pg.pl, + contrib/check_netapp.pl, contrib/check_nmap.py, + contrib/check_ora_table_space.pl, contrib/check_oracle_instance.pl, + contrib/check_oracle_tbs, contrib/check_pcpmetric.py, + contrib/check_pfstate, contrib/check_qmailq.pl, contrib/check_rbl.c, + contrib/check_remote_nagios_status.pl, contrib/check_rrd_data.pl, + contrib/check_sap.sh, contrib/check_smart.pl, contrib/check_smb.sh, + contrib/check_snmp_disk_monitor.pl, contrib/check_snmp_printer.pl, + contrib/check_snmp_process_monitor.pl, contrib/check_snmp_procs.pl, + contrib/check_sockets.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc, contrib/check_timeout.c, + contrib/check_traceroute-pure_perl.pl, contrib/check_traceroute.pl, + contrib/check_uptime.c, contrib/check_vcs.pl, contrib/check_wave.pl, + contrib/check_wins.pl, contrib/checkciscotemp.pl, contrib/mrtgext.pl, + contrib/nagios_sendim.pl, contrib/packet_utils.pm, contrib/rblcheck-dns, + contrib/rblcheck-web, contrib/restrict.pl, contrib/sched_downtime.pl, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_traffic-0.91b.tar.gz, + contrib/tarballs/fetchlog-0.94.tar.gz, contrib/urlize.pl, + contrib/utils.py: Remove "contrib" plugins + + These days, sites such as "Nagios Exchange" are a much better place for + publishing plugins not maintained by the Plugins Development Team. + + * command.cfg.in, configure.in: Remove the outdated "command.cfg" file + +2013-08-27 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Update + copyright year + + We touched the Development Guidelines this year. + + * NEWS: Mention that check_snmp now supports >8 OIDs + + Closes #37. + + * plugins/common.h: Partially revert "check_snmp: Close potential for + using uninitialized memory" + + This reverts the changes to plugins/common.h applied by commit + a20611d4357c3c3ebe0a62776a1642e7904c1410. + + - Clang defines __GNUC__. + - The new name of the __attribute__ parameter was misleading. + + * plugins/check_snmp.c: check_snmp: Fix --help segfault + +2013-08-26 Holger Weiss + + * NEWS: Mention new "check_disk -f" option + + Closes #22. + +2013-08-23 Ton Voon + + * tools/build_perl_modules: Use own variable instead of ENV + + * perlmods/Makefile.am, perlmods/install_order, + tools/build_perl_modules: Updated with last working copy of + build_perl_modules used by Opsview + +2013-08-23 Sven Nierlein + + * perlmods/install_order, tools/build_perl_modules: perlmods: fixed + install_order + + on older systems Module::Build is not available by default, therefore we have + to change the order of installation. + +2013-08-22 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Multiline + output + + Document the multiline output format properly. + + Thanks to Jochen Bern for providing this patch. + +2013-08-21 Holger Weiss + + * doc/developer-guidelines.sgml: developer-guidelines.sgml: Allow + special value "U" + + Allow a literal "U" to be specified in place of an actual value within + the performance data string. An "U" corresponds to RRDtool's "UNKNOWN" + value; i.e., it's meant to indicate that data acquisition failed for + some reason. PNP4Nagios already supports this extension. + +2013-08-21 Sven Nierlein + + * doc/developer-guidelines.sgml: removed duplicate entry + + * plugins/t/check_tcp.t: fixed check_tcp test + + A check with thresholds 9000,1 must exit with warning if the certificate expires in less + than 9000 but more than one day. + + * test.pl.in: no need to set verbose mode, thats what "make test-debug" + is for + + * plugins/t/check_snmp.t: check_snmp: added threshold tests + +2013-08-21 Holger Weiss + + * plugins/check_snmp.c: check_snmp: Fix support for inverse thresholds + + Commit bd782990566eec91b8312cfc2765a7e2bd9e67da reintroduced support for + inverse threshold ranges such as "2:1", but it broke standard thresholds + such as "1:2" (by converting this range into "1") or "1:" (by converting + this range into "@:2"). This commit fixes those two bugs, plus an + off-by-one error while computing the number of bytes to allocate when + handling inverse thresholds (two additional bytes were allocated where + three were required to hold '@' and ':' and '\0'). While at it, we also + check whether malloc(3) succeeded. + +2013-08-21 Ton Voon + + * perlmods/Class-Accessor-0.31.tar.gz, + perlmods/Class-Accessor-0.34.tar.gz, perlmods/Config-Tiny-2.10.tar.gz, + perlmods/Config-Tiny-2.14.tar.gz, perlmods/Math-Calc-Units-1.06.tar.gz, + perlmods/Math-Calc-Units-1.07.tar.gz, + perlmods/Module-Build-0.4007.tar.gz, + perlmods/Module-Implementation-0.07.tar.gz, + perlmods/Module-Metadata-1.000014.tar.gz, + perlmods/Module-Runtime-0.013.tar.gz, perlmods/Perl-OSType-1.003.tar.gz, + perlmods/Test-Simple-0.70.tar.gz, perlmods/Test-Simple-0.98.tar.gz, + perlmods/Try-Tiny-0.18.tar.gz, perlmods/install_order, + perlmods/parent-0.226.tar.gz, perlmods/version-0.9903.tar.gz, + tools/build_perl_modules: Updated perl modules + +2013-08-19 Holger Weiss + + * perlmods/Params-Validate-0.88.tar.gz, + perlmods/Params-Validate-1.08.tar.gz, tools/build_perl_modules: Update + the bundled Params::Validate module + + Building the old version fails with recent Perl releases: + + | Validate.xs: In function `get_type': + | Validate.xs:208:5: error: duplicate case value + | Validate.xs:205:5: error: previously used here + +2013-08-20 Holger Weiss + + * plugins/sslutils.c: Set SSL_MODE_AUTO_RETRY flag + + We use OpenSSL (or GnuTLS) with blocking semantics, and we don't want + SSL_read(3) or SSL_write(3) calls to return SSL_ERROR_WANT_READ or + SSL_ERROR_WANT_WRITE (see #3614716). + + * contrib/check_http-with-client-certificate.c: Ditch + contrib/check_http-with-client-certificate.c + + The standard check_http plugin now supports client certificate + authentication. + + * .gitignore: Add new Gnulib files to .gitignore + + * configure.in: Check for who(1) only if utmpx(5) isn't available + + The who(1) command is only called by check_users if the system doesn't + provide an utmpx(5) interface. + + * configure.in, plugins/Makefile.am, plugins/check_users.c: check_users: + Use utmpx(5) only if available + + For systems that don't provide an utmpx(5) interface, restore the code + that was replaced in commit 3e622f3a47bc7d31f22513a79892c3c52febd2d3. + +2013-08-20 Sven Nierlein + + * lib/utils_base.c, plugins/common.h: added missing header to fix build + on freebsd + + * po/Makefile.in.in: changed obsolete automake macro + +2013-08-20 Holger Weiss + + * plugins/check_ide_smart.c: check_ide_smart: "__linux__" instead of + "linux" + + C compilers in standards compliance mode will not define "linux", as it + doesn't begin with an underscore. + + * NEWS, THANKS.in, configure.in, plugins/check_ide_smart.c: + check_ide_smart: Add support for NetBSD + + Thanks to Emmanuel Dreyfus for providing the patch. + +2013-08-19 Holger Weiss + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4: Replace + Gnulib's "getopt" module with "getopt-gnu" + + The "getopt" module is marked as deprecated, these days we're supposed + to choose either "getopt-posix" or "getopt-gnu". + + * build-aux/config.rpath, build-aux/snippet/_Noreturn.h, + build-aux/snippet/arg-nonnull.h, build-aux/snippet/c++defs.h, + build-aux/snippet/warn-on-use.h, gl/Makefile.am, gl/alignof.h, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/base64.c, gl/base64.h, gl/basename-lgpl.c, gl/basename.c, gl/btowc.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/close-hook.c, gl/close-hook.h, gl/config.charset, gl/dirname-lgpl.c, + gl/dirname.c, gl/dirname.h, gl/dosname.h, gl/dup-safer.c, gl/dup2.c, + gl/errno.in.h, gl/error.c, gl/error.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fcntl.c, gl/fcntl.in.h, gl/fd-hook.c, + gl/fd-hook.h, gl/fd-safer.c, gl/float+.h, gl/float.c, gl/float.in.h, + gl/floor.c, gl/floorf.c, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, + gl/full-read.h, gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, + gl/getaddrinfo.c, gl/getdtablesize.c, gl/gethostname.c, gl/getloadavg.c, + gl/getopt.c, gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, + gl/gettext.h, gl/glthread/lock.c, gl/glthread/lock.h, + gl/glthread/threadlib.c, gl/inet_ntop.c, gl/intprops.h, gl/itold.c, + gl/langinfo.in.h, gl/localcharset.c, gl/localcharset.h, gl/locale.in.h, + gl/localeconv.c, gl/m4/00gnulib.m4, gl/m4/alloca.m4, + gl/m4/arpa_inet_h.m4, gl/m4/asm-underscore.m4, gl/m4/base64.m4, + gl/m4/btowc.m4, gl/m4/c-strtod.m4, gl/m4/codeset.m4, + gl/m4/configmake.m4, gl/m4/dirname.m4, gl/m4/dos.m4, + gl/m4/double-slash-root.m4, gl/m4/dup2.m4, gl/m4/eealloc.m4, + gl/m4/environ.m4, gl/m4/errno_h.m4, gl/m4/error.m4, gl/m4/exponentd.m4, + gl/m4/extensions.m4, gl/m4/extern-inline.m4, gl/m4/fcntl-o.m4, + gl/m4/fcntl-safer.m4, gl/m4/fcntl.m4, gl/m4/fcntl_h.m4, + gl/m4/float_h.m4, gl/m4/floorf.m4, gl/m4/fstypename.m4, + gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, gl/m4/getdtablesize.m4, + gl/m4/gethostname.m4, gl/m4/getloadavg.m4, gl/m4/getopt.m4, + gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/langinfo_h.m4, gl/m4/largefile.m4, + gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, gl/m4/lib-link.m4, + gl/m4/lib-prefix.m4, gl/m4/localcharset.m4, gl/m4/locale-fr.m4, + gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, gl/m4/locale_h.m4, + gl/m4/localeconv.m4, gl/m4/lock.m4, gl/m4/longlong.m4, + gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, gl/m4/malloca.m4, gl/m4/math_h.m4, + gl/m4/mbrtowc.m4, gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, gl/m4/mbtowc.m4, + gl/m4/memchr.m4, gl/m4/mktime.m4, gl/m4/mmap-anon.m4, gl/m4/mode_t.m4, + gl/m4/mountlist.m4, gl/m4/msvc-inval.m4, gl/m4/msvc-nothrow.m4, + gl/m4/multiarch.m4, gl/m4/netdb_h.m4, gl/m4/netinet_in_h.m4, + gl/m4/nl_langinfo.m4, gl/m4/nls.m4, gl/m4/nocrash.m4, gl/m4/off_t.m4, + gl/m4/onceonly.m4, gl/m4/open.m4, gl/m4/po.m4, gl/m4/printf-posix.m4, + gl/m4/printf.m4, gl/m4/progtest.m4, gl/m4/read.m4, gl/m4/regex.m4, + gl/m4/safe-read.m4, gl/m4/safe-write.m4, gl/m4/servent.m4, + gl/m4/setenv.m4, gl/m4/sha1.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/socketlib.m4, gl/m4/sockets.m4, gl/m4/socklen.m4, + gl/m4/sockpfaf.m4, gl/m4/ssize_t.m4, gl/m4/stat.m4, gl/m4/stdalign.m4, + gl/m4/stdbool.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, + gl/m4/string_h.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, gl/m4/strsep.m4, + gl/m4/strstr.m4, gl/m4/sys_socket_h.m4, gl/m4/sys_stat_h.m4, + gl/m4/sys_types_h.m4, gl/m4/sys_uio_h.m4, gl/m4/threadlib.m4, + gl/m4/time_h.m4, gl/m4/time_r.m4, gl/m4/timegm.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/warn-on-use.m4, gl/m4/wchar_h.m4, gl/m4/wchar_t.m4, + gl/m4/wcrtomb.m4, gl/m4/wctype_h.m4, gl/m4/wint_t.m4, gl/m4/write.m4, + gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, gl/malloc.c, + gl/malloca.c, gl/malloca.h, gl/math.c, gl/math.in.h, gl/mbrtowc.c, + gl/mbsinit.c, gl/mbtowc-impl.h, gl/mbtowc.c, gl/memchr.c, gl/mktime.c, + gl/mountlist.c, gl/mountlist.h, gl/msvc-inval.c, gl/msvc-inval.h, + gl/msvc-nothrow.c, gl/msvc-nothrow.h, gl/netdb.in.h, gl/netinet_in.in.h, + gl/nl_langinfo.c, gl/open-safer.c, gl/open.c, gl/pipe-safer.c, + gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, + gl/printf-parse.h, gl/read.c, gl/ref-add.sin, gl/ref-del.sin, + gl/regcomp.c, gl/regex.c, gl/regex.h, gl/regex_internal.c, + gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, gl/safe-read.h, + gl/safe-write.c, gl/safe-write.h, gl/setenv.c, gl/sha1.c, gl/sha1.h, + gl/size_max.h, gl/snprintf.c, gl/sockets.c, gl/sockets.h, gl/stat.c, + gl/stdalign.in.h, gl/stdbool.in.h, gl/stddef.in.h, gl/stdint.in.h, + gl/stdio-write.c, gl/stdio.in.h, gl/stdlib.in.h, gl/str-two-way.h, + gl/strdup.c, gl/streq.h, gl/strerror-override.c, gl/strerror-override.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strndup.c, + gl/strnlen.c, gl/strsep.c, gl/strstr.c, gl/sys_socket.c, + gl/sys_socket.in.h, gl/sys_stat.in.h, gl/sys_types.in.h, + gl/sys_uio.in.h, gl/time.in.h, gl/time_r.c, gl/timegm.c, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd.c, gl/unistd.in.h, gl/unsetenv.c, + gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, gl/verify.h, + gl/vsnprintf.c, gl/w32sock.h, gl/wchar.in.h, gl/wcrtomb.c, + gl/wctype-h.c, gl/wctype.in.h, gl/write.c, gl/xalloc-die.c, + gl/xalloc-oversized.h, gl/xalloc.h, gl/xmalloc.c, gl/xsize.c, + gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h: Sync with the latest Gnulib + code (6f2d632) + + * configure.in, plugins/common.h: Clean up check for + _SC_NPROCESSORS_ONLN + + Closes #62. + +2013-08-19 Booker C. Bense + + * configure.in, plugins/common.h: Bug fix for ncpus if hyperthreading + turned off in linux + +2013-08-18 Holger Weiss + + * plugins/check_http.c: check_http: Document the new -E option + + Mention the -E/--extended-perfdata flag in the --help output. + + * plugins/check_http.c, plugins/netutils.h, plugins/sslutils.c: + Abbreviate function name + + Make a very long function name at least a little bit shorter. + + * NEWS: Mention the new "check_http -J/-K" options + + Closes #48. + + * NEWS: Mention the new "check_mysql -f/-g" options + + Closes #32. + + * plugins/check_mysql.c: check_mysql: Don't accept new positional + arguments + + Do not also accept the new -f/--file and -g/--group options as + positional arguments (especially not prior to "db_pass" and "db", as + that would break backward compatibility). + + * plugins/check_mysql.c: check_mysql: Use xasprintf instead of asprintf + + * plugins/check_mysql.c: check_mysql: Fix copy'n'pasted comments + +2013-08-18 Steve Weinreich + + * plugins/check_fping.c: check_fping error handling enhanced, generates + UNKNOWN on + fping parameter error (i.e. wrong interface, missing perms ..) + +2013-08-18 Holger Weiss + + * NEWS, plugins/check_snmp.c: NEWS: Mention the new "check_snmp + --offset" option + + ... and apply two small cosmetic changes to check_snmp.c. + + Closes #59. + +2013-08-05 Simon Kainz + + * plugins/check_snmp.c: added --offset option to allow adjustment of + sensor data + +2013-08-18 Holger Weiss + + * plugins/check_http.c: check_http: Use xasprintf instead of asprintf + + * plugins/check_http.c: check_http: s/--header_string/--header-string/ + + The name of the new option is "--header-string". + + * plugins/check_snmp.c: check_snmp: Allocate space for the new -Le + option + + Closes #41. + +2013-03-14 Mark Keisler + + * plugins/check_snmp.c: Add -Le option to snmpcmd to avoid error message + of 'No Log Handling Enabled...' + +2013-08-18 Holger Weiss + + * NEWS: Mention the check_mysql changes + + Closes #14. + +2012-11-20 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: Connections should have been + defined as a counter + + * plugins/check_mysql.c: Counter increments were incorrect; remove the + leading space from perfdata + +2012-08-06 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: add perfromance metrics for all + checks + +2012-08-03 Tim Laszlo + + * plugins/check_mysql.c: check_mysql: when checking slave thread add + performance data for seconds behind master + +2013-08-18 Holger Weiss + + * NEWS: Mention the new "check_http -d" option + + Closes #7. + + * plugins/tests/check_http.t: Fix the "check_http -d" tests + +2012-06-06 linkslice + + * plugins/check_http.c, plugins/tests/check_http.t: added ability to + check regex against http headers. booyah! + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_procs behavior + + Closes #60. + +2013-08-18 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: clarify debug message + + * plugins/check_procs.c: check_procs: Assume we have stat() + + stat() is in gnulib anyway, so we can safely depend on it. + + * configure.in, plugins/check_procs.c: check_procs: Get rid of + HAVE_PROC_PID_EXE + + Don't check for /proc/pid/exe at compile time, it could be gone in a + build chroot or the like. Checking at runtime (once) is sufficient. + +2012-12-09 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: Ignore ENOENT when checking for + myself + + Previously, when a process exited between the call to /bin/ps and + stat("/proc/his/exe") was exiting it was not considered as possible + instance of check_procs. This commit makes check_procs ignore all + processes where /proc/pid/exe does not exist. + +2012-11-07 Sebastian Schmidt + + * plugins/check_procs.c: check_procs: fix typo + + Fix a typo in previous commit where st_ was missing in the mock + struct_stat_t, causing check_procs.c to not compile without sys/stat.h. + + * configure.in, plugins/check_procs.c: check_procs: filter out self by + /proc/pid/exe + + Make check_procs filter out itself in the process list by comparing the + file pointed to by /proc/pid/exe. On platforms where this is not + available or when check_procs is passed the -T flag, the old behaviour + (check whether PID equals getpid()) is retained. + + This fixes some false alarms when e.g. Nagios has, for whatever reasons, + some backlog of checks to run and check_procs with -a is called more + than once in a short time, matching its sister process. + +2013-08-18 Holger Weiss + + * gl/Makefile.am, gl/fsusage.c, gl/m4/fcntl-o.m4, gl/m4/fsusage.m4, + gl/m4/gnulib-comp.m4, gl/m4/lib-link.m4, gl/m4/malloc.m4, + gl/m4/stdlib_h.m4, gl/stdlib.in.h, gl/str-two-way.h, gl/string.in.h: + Sync with the latest Gnulib code (6f2d632) + + * NEWS: Mention check_mysql's SSL support + + Closes #51. + + * plugins/check_mysql.c: check_mysql: Cosmetic changes to SSL support + + Use (slightly) more intuitive option names etc. + +2013-05-22 Juan Carlos Fernandez + + * plugins/check_mysql.c: Added ssl support to check_myslq + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_procs -k option + + Closes #53. + +2013-05-29 Richard Leitner + + * plugins/check_procs.c: Fixed SF.net bug #3552839, check_procs: added + -k option to ignore kernel threads + + This commit fixes sourceforge.net bug #3552839. + It adds a -k|--no-kthreads option to ignore kernel thread processes. + Please note: currently this feature only works for GNU/Linux systems (due to the fact I have no other systems to test/develop on) + Sorry for that, but I'm sure this can be accomplished by somebody else ;-) + +2013-08-18 Holger Weiss + + * contrib/check_linux_raid.pl: Fix whitespace errors + + Use tabs instead of spaces for indentation. + +2013-06-11 Erwan Ben Souiden + + * contrib/check_linux_raid.pl: update check_linux_raid to take in + consideration resync status and rise up a warning alert + +2013-08-18 Holger Weiss + + * NEWS: Mention the new check_fping features + + * configure.in, plugins/check_fping.c: check_fping: Use fping6(8) only + if available + + Let check_fping use IPv6 only if + + - the operating system supports IPv6, + - the user didn't specify --without-ipv6, and + - the "configure" script found the fping6(8) binary. + +2013-08-17 Holger Weiss + + * plugins/check_fping.c: check_fping: Remove unused printf(3) arguments + +2012-12-20 Steve Weinreich + + * plugins/check_fping.c: Added -S und -I parameter to match fping -S and + -I parameters. + + -S allows to specify the source ip for ICMP pakets + -I allows to specify a interface to bind to + +2013-08-17 Holger Weiss + + * plugins/check_pgsql.c: check_pgsql: Add missing printf(3) argument + + * NEWS: Mention the new check_pgsql features + + Closes #16. + + * plugins/check_pgsql.c: check_pgsql: Remove -4/-6 flags from help + output + + The -4/-6 options are currently not supported. + + * plugins/t/check_procs.t: Expect performance data + + The check_procs plugin now emits performance data, fix the test(s) + accordingly. + + * plugins/t/check_apt.t: Expect performance data + + The check_apt plugin now emits performance data, fix the test(s) + accordingly. + +2013-01-26 Dominique Broeglin + + * lib/tests/test_utils.c: Adding tests for range @1:1 + +2013-08-15 Sven Nierlein + + * NEWS, THANKS.in, plugins/check_http.c, plugins/t/check_http.t: cleanup + after check_http patch (fixes #50) + + - cleanup whitespace + - added test cases + - print time_ssl only if ssl is in use + - updated news and thanks file + +2013-05-19 Sebastian Nohn + + * plugins/check_http.c: log more perfdata in check_http + +2013-08-15 Sven Nierlein + + * NEWS, THANKS.in: updated news and thanks file + + * plugins/t/check_http.t: corrected http test + + multiple headers have to be set by multiple -k switches. Seperating them + by semicolons is not longer supported as semicolons are valid characters in + http headers. + +2013-08-12 Rafael + + * plugins-scripts/check_disk_smb.pl: Changed the smbclient command used + to fetch the free space available on the samba shares. Using du instead + of ls, since it's much faster, specially with shares that have a lot of + files. + +2013-07-11 Jan Wagner + + * THANKS.in, plugins/check_smtp.c: Fixed SF.net bug 2555775, threshold + can be double for check_smtp + + Thanks to Roman Fiedler for reporting the issue and providing a fix + +2013-07-08 Jan Wagner + + * THANKS.in, plugins/check_nt.c: check_nt: Fixes NULL pointer + dereference + + Thanks to Vaclav Ovsik for reporting the issue and providing a fix + +2013-06-30 Holger Weiss + + * .gitignore: Add libnpcommon.a file to .gitignore + + * plugins/check_ntp_peer.c: check_ntp_peer: Verify type of response + packets + + The check_ntp_peer plugin now ignores response packets with an + unexpected "Operation Code" and/or "Sequence" number (cf. RFC 1305, + Appendix B). This fixes an issue where the check_ntp_peer requests got + duplicated on their way to the server (due to some network switch bug), + and the server therefore sent multiple responses per request. + + Thanks to Marc Haber for reporting the issue. + +2013-06-25 Holger Weiss + + * NEWS: Mention that check_apt spits out perfdata + +2013-06-25 Jan Wagner + + * plugins/check_apt.c: Fixed SF.net bug 1614553, Debian bug #708343, + Adding performace data + +2013-05-30 Richard Leitner + + * plugins/check_apt.c: check_apt now correctly exits when apt-get return + != 0 + + This commit fixes an issue with check_apt where check_apt doesn't exit + with the appropriate return code when apt-get returned a non-zero value. + +2013-05-29 Richard Leitner + + * plugins/check_http.c: Fixed SF.net bug #3571331, check_http converts + semicolon to newline in -k + + This commit fixes sourceforge.net bug id 3571331. + The semicolon was defined as input delimiter for multiple values in the -k arguments. + Due to the fact the semicolon is a valid character for HTTP header fields this input delimiter function was removed. + It is still possible to pass multiple header fields via multiple -k (like described in helptext). + +2013-05-19 Gabriele Tozzi + + * plugins-scripts/check_sensors.sh: Made verbose output of check_sensors + compilant + +2013-05-17 Lionel Cons + + * plugins/check_http.c, plugins/netutils.h, plugins/sslutils.c: added + support for client authentication via SSL + +2013-05-12 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention the latest changes + +2012-08-17 Diego Elio Pettenò + + * configure.in: configure: add --without-ldap, --without-radius and + --without-dbi options. + + When building for distributions such as Gentoo Linux, or FreeBSD + ports, it's convenient to be able to disable building certain + functionalities even if the dependencies are present, to avoid what + are called "automagic dependendencies". + + Adding these parameters solve the issue. + + * plugins/Makefile.am: build: fix building with parallel make. + + By using a more automake-style handling of dependencies and a single + convenience library, it's tremendously easy to build in parallel. + + Note that since the linking happens with the static archives, the + unused objects are discarded and provide no overhead whatsoever. + + * plugins/check_dig.c, plugins/check_dns.c, plugins/runcmd.c, + plugins/runcmd.h: plugins: rename runcmd's signal handler. + + The previous name would collide with popen's. Even if the two are + never used together, it's still a good idea not to have the same + symbol in multiple object files. + +2013-03-25 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention Richard Leitner's changes + +2013-03-22 Richard Leitner + + * plugins/check_disk.c: Fixed SF.net bug 3560976, added + --include-type/-N option + +2013-03-17 Richard Leitner + + * plugins/check_nagios.c: Fixed SF.net bug 3602586, added timeout option + for check_nagios + + * plugins/check_apt.c: Fixed SF.net bug 3539317, typo in --help of + check_apt + +2013-03-25 Holger Weiss + + * NEWS, THANKS.in: NEWS, THANKS: Mention check_oracle --connect flag + +2013-01-15 Brian De Wolf + + * plugins-scripts/check_oracle.sh: Add option to perform real login in + check_oracle + + The Oracle plugin has no option for testing for a successful login. The + closest option to this is --login, which uses a fixed set of credentials and + expects to receive the logon failure error code. + + This patch adds an option called --connect. This option takes a full SID and + returns success if it doesn't detect any error codes. With this, we can check + that a database is allowing logins from valid credentials (and avoid filling up + DB logs with failed authentications). + +2013-02-27 Joerg Linge + + * plugins/check_procs.c: Update plugins/check_procs.c + + added missing longopt --user + +2013-02-27 Fabio Rueda + + * contrib/check_nmap.py: working on ubuntu precise12.04 + + * contrib/check_nmap.py: ported use whrandom to random + +2013-02-10 Sven Nierlein + + * plugins/check_tcp.c, plugins/t/check_tcp.t: check_tcp: don't ignore + trailing options + + "./check_tcp -6 -p 80 host" leads to an error: + TCP CRITICAL - Invalid hostname, address or socket: 127.0.0.1 + because 127.0.0.1 is the fallback host, the tailing hostname + was ignored. + +2013-01-29 Robin Sonefors + + * plugins/check_snmp.c, plugins/common.h: check_snmp: Close potential + for using uninitialized memory + + This was reported by clang, and in order for it to understand attributes + properly, I had to modify the macro that checks for non-gcc compilers. + + * plugins/check_snmp.c: check_snmp: Dynamically grow all data structures + + Before this patch, there was a constant, MAX_OIDS, that determined the + amount of slots most (but not all - see labels) array data structures + would have. It was set to 8. + + Some users would like to use more than that, but rather than bumping the + constant, let's use the same type of logic we already use for labels - + grow the space 8 slots at a time. This will allow us to potentially + support an infinite amount of oids - or at least as many as the + packetsize on the SNMP server allows, which is usually significantly + smaller than infinity, yet often larger than 8. + +2013-01-24 Daniël van Eeden + + * REQUIREMENTS, plugins/check_mysql.c: Apply my patch from: + http://sourceforge.net/tracker/index.php?func=detail&aid=3269273&group_id=29880&atid=397597 + +2013-01-23 Sven Nierlein + + * NEWS, THANKS.in: added latest commits to NEWS file + + * plugins/t/check_dig.t: updated check dig tests + + nagios.com seems to have changed their ip address. Also added tests + about -4/-6 option. + +2012-12-28 Ville Mattila + + * plugins/check_dig.c: check_dig: query transport selection support + + Add command line options -4 and -6 (--use-ipv4 and + --use-ipv6) to check_dig. + + Effectively this adds no new functionality, just a + shortcut for: + check_dig -A "-4" + check_dig -A "-6" + + Needed for using check_dig with the check_v46 wrapper + (see e.g. + https://gitorious.org/nagios-monitoring-tools/nagios-monitoring-tools/blobs/master/check_v46) + which requires -4/-6 command line option support. + +2013-01-23 Sven Nierlein + + * ChangeLog, THANKS.in: updated changelog and thanks file for previous + patch + +2013-01-23 Robin Sonefors + + * plugins/check_snmp.c: check_snmp: Don't thrash memory when using + multiple label/unit argument + + The memory allocation mixed up number of bytes with number of pointers, + meaning as soon as we'd reach (on 64 bit systems) the second argument, + we'd start writing it outside of our allocated memory. + + Normally, this isn't too visible, but as soon as you (again, on my 64 + bit system) reach argument number 8, you get a segfault. It is easily + reproducible with: + check_snmp -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' \ + -o '' -l '' -o '' -l '' -o '' -l '' -o '' -l '' + + This patch allocates the proper amount of memory, to fix the issue. + +2012-12-28 Jonathan Milby + + * plugins/check_mysql.c: Updated check_mysql.c to take client options + file and group parameters + +2012-12-28 Ville Mattila + + * configure.in, plugins/check_fping.c: check_fping: IPv6 support + + Add command line options -4 and -6 (--use-ipv4 and + --use-ipv6) to check_fping. IPv4 is used by default, + maintaining backwards compatibility with older + check_fping versions. IPv6 support requires the + fping6 program. + + The implementation is really just an imitation of + check_ping IPv6 support: Plugin command line option + -4/-6 designates whether to run fping/fping6. + + Please note that especially the changes to + configure.in might be all wrong - I don't know + what's the proper autoconf way, patching + configure.in just seemed to work for me. + +2012-12-03 palli + + * doc/developer-guidelines.sgml: Table 4 example 5 updated + + Description did not specify that it condition is critical if "stuff" + is less than zero. + + * doc/developer-guidelines.sgml: Description for table4 example7 + + My original patch was based on the online version which was apparently out of date. + + In the meantime someone changed the description of example7 instead of the example. I think this is better because + otherwise example 6 and 7 are basically the same. + +2012-10-24 Pall Sigurdsson + + * doc/developer-guidelines.sgml: Bugfix, fixed a broken command-line + example + + The last example in the table contradicted the previous example. Surely + it's purpose was to showcase the @ behaviour to invert threshold, but the + @ sign was missing. + + I also clarified the description to the second last example so it is in same + style as the others. + +2012-11-28 Sven Nierlein + + * plugins/check_ntp.c, plugins/check_ntp_time.c: check_ntp(_time): don't + die on connect errors + + connect errors may happen if clients check agains dual + stacked ipv4/6 ntp servers. + + * plugins/check_ldap.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/check_pgsql.c, plugins/check_ssh.c: + unified ipv4/6 usage and help text + +2012-11-14 Holger Weiss + + * NEWS: Mention the check_procs performance data + + * plugins/check_procs.c: check_procs: Remove superfluous newline + character + +2011-04-08 Sebastian Harl + + * plugins/check_procs.c: check_procs: Added performance data to plugin + output. + + * plugins/check_procs.c: check_procs: Use the range/threshold support + functions from libnagiosplug. + + This adds support for @ and makes stuff a bit simpler by removing code + duplications. + + Note: Previously, the compatibility code for 'check_procs ' + accepted something like 'check_procs -w 10:-1 -c 10:-1 20 50' as well + (treating it as if '-w 10:20 -c 10:50' was specified). This is no longer the + case ... additional arguments are only used as warn/crit thresholds in case + -w/-c is not specified at all. + +2012-11-07 Thomas Guyot-Sionnest + + * .gitignore, doc/makefile, tools/sfwebcron: Fix sfwebcron probe file + + The initial file was created in the user's home and later tested in the + doc directory. Instead, just rsync if the file is missing. + + Also add some temporary files to gitignore/make clean + +2012-11-04 dermoth + + * NEWS: Update NEWS for bd78299 - check_snmp reverse ranges fix + +2012-11-03 dermoth + + * tools/sfwebcron, tools/snapshot: Update tools + + - fix sfwebcron (tool updating sf developer guidelines) + - remove obsolete snapshot script + + * tools/np_build_from_sf, tools/update_man_pages: Add scripts that + update man pages in drupal + +2012-11-02 Andreas Ericsson + + * plugins/check_snmp.c: plugins/check_snmp: Show snmp error when we fail + to parse its output + + Dying without a hint of what went wrong is just plain annoying. With + this patch we at least get a hint. + + While at it, we fix the string offset so the output we're interested + in doesn't keep the equal sign that snmpget prints. + + * lib/utils_base.c: Stop dumping core on bad args to check_snmp + + Since the state patch introduction, we've been freeing uninitialized + memory in lib/utils_base.c::np_cleanup(), which caused coredumps + with check_snmp when illegal threshold ranges (for example) were + passed, or when we called 'die' without having read any state. + + This patch fixes it by replacing the malloc() calls in there (all of + them, since using malloc() is almost always an error) with calloc(). + + malloc() either doesn't initialize the memory at all, or taints it + with a special marker so it can tell us when we're free()'ing memory + that hasn't been initialized. calloc() explicitly initializes the + allocated memory to nul bytes, which is a zero-cost operation when + we get the memory from the kernel (which alread does that) and almost + always desirable everywhere else. + + * plugins/check_snmp.c: Make check_snmp backwards compatible in how it + parses thresholds + + Once upon a time, check_snmp used to accept inverse ranges in the + format of '2:1' to mean "alert if value is inside this range". + + Since commit 7cb3ae09334796f3b54e4e6438e38c2cc679b360, ranges such + as those have instead triggered the error "Range format incorrect" + and resulted in an UNKNOWN warning state. This patch attempts to + fix the situation so that the old-style ranges continues to mean + exactly what the once did and people with lots of snmp checks can + avoid a bazillion false positives from their environments. + +2012-10-12 chl + + * plugins/check_disk.c: check_disk: option to ignore reserved space + + This commit add a runtime option to ignore the root-reserved space + when calculating perfdata. + + Before / after: + ./check_disk -w 2% -c 1% /home + ./check_disk -w 2% -c 1% -f /home + DISK CRITICAL - free space: /home 272 MB (1% inode=83%);| /home=17551MB;18401;18589;0;18777 + DISK CRITICAL - free space: /home 272 MB (1% inode=83%);| /home=17551MB;17466;17644;0;17823 + + Well, it doesn't really give me more space :) but the perfdata are a + little bit more coherent. + + Note that there are still a rounding issue on the percent calculation + (cf calculate_percent() comments, taken from coreutils 'df' command). + 272/17823 -> 1.526% + + Since the warning/critical/min/max data are usually not saved in RRD DB, + you can activate the option without seeing landslides in the graphs. + +2012-10-09 Holger Weiss + + * NEWS: Mention the OPENSSL_config(3) support + +2012-10-05 Marc Huffnagle + + * plugins-scripts/utils.sh.in: Added additional documentation to the + check_range function + +2012-10-09 Holger Weiss + + * plugins/common.h: Allow for configuring OpenSSL + + Let OpenSSL load its configuration file. See the OPENSSL_config(3) man + page for details. + + (Suggested by Max Kosmach in Debian bug report #689960, forwarded by Jan + Wagner.) + +2012-10-03 Alex Bradley + + * plugins/check_apt.c, plugins/t/check_apt.t, + plugins/t/check_apt_input/debian1, plugins/t/check_apt_input/debian2, + plugins/t/check_apt_input/debian3, plugins/t/check_apt_input/ubuntu1, + plugins/t/check_apt_input/ubuntu2: Tests for check_apt + + Add a hidden "--input-file" option to check_apt (modelled on + check_procs) so that it can take files with sample apt output as input. + + Add tests for my SECURITY_RE fix (debian3) and for the include, exclude + and critical options. + + * plugins/check_apt.c: Fix SourceForge bug 1904965 - check_apt: + SECURITY_RE is not correct + + For the default security upgrade detection regular expression, match + "Debian-Security" in package description when it's anywhere after the + first parenthesis (not just the second space-delimited word). For + example: + + ... (4.0.1-5.4 Debian:6.0.6/stable, Debian-Security:6.0/stable ... + +2012-10-02 Alex Bradley + + * plugins/check_apt.c: Don't prepend "^Inst" or append a space to the + "include", "exclude", or + "critical" regular expressions. Instead, check for lines beginning + with "Inst" using strncmp and apply the regular expressions only when + such lines are found. + + Fixes Debian bug #522812, along the lines suggested by the bug + submitter, Justin T Pryzby. + +2012-09-25 Gianluca Varisco + + * plugins/check_disk.c: Update plugins/check_disk.c + + CRITCAL -> CRITICAL typo + +2012-09-21 Alex Bradley + + * contrib/check_linux_raid.pl: This patch fixes the regular expression + for the array recovery + completion percentage to detect the percentage when there is more than + one space between between "recovery =" and the percentage. (When + the percentage is less than 10%, /proc/mdstat shows it left-padded + with an extra space: "recovery = 7.6%".) + +2012-08-10 Holger Weiss + + * plugins/check_http.c: check_http: Update description of -C option + + Mention that the -C option now accepts two comma-separated values. + + * plugins/check_http.c: check_http: Add missing newline to --help output + +2012-07-26 William Leibzon + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c: + fixing bug in certificate experiation patch checking for bad warning + threshold data + +2012-08-10 Holger Weiss + + * plugins/tests/check_http.t: tests/check_http.t: Fix whitespace issues + + In tests/check_http.t, tabs are used for indentation. + + While at it, apply another few cosmetic changes. + + * plugins/tests/check_http.t: tests/check_http.t: Update the number of + SSL tests + + * plugins/tests/check_http.t: tests/check_http.t: Fix test case + + Fix the test case which is meant to make sure that + + check_http -C , [...] + + returns a CRITICAL state if is large enough. + +2012-08-06 Holger Weiss + + * NEWS: Mention fixed compilation without SSL + + * plugins/check_ntp_peer.c: check_ntp_peer: Fix --help output for -m and + -n + + Fix the threshold specifications in the example for checking the number + of truechimers. + + Reported by Marc Haber on the "nagios-users" mailing list (Message-ID: + <20120722142840.GA6931@torres.zugschlus.de>). + + * plugins/check_ntp_peer.c: check_ntp_peer: Fix --help output for -W and + -C + + Mention that the check_ntp_peer plugin checks the stratum of the + synchronization peer, not the stratum of the monitored server itself. + + Thanks to Marc Haber for bringing this up on the "nagios-users" mailing + list (Message-ID: <20120722142840.GA6931@torres.zugschlus.de>). + +2012-07-18 Holger Weiss + + * plugins/check_http.c: check_http: Fix whitespace issues + + In check_http.c, tabs aren't used for indentation. + + * plugins/check_http.c: check_http: Fix compilation without SSL support + + The "ssl_version" variable was undeclared when the plugins were compiled + --without-openssl and --without-gnutls. + + Bug reported by Michael LaCorte on the "nagiosplug-help" mailing list + (Message-ID: ). + +2011-04-08 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Determine connection time in + µs-resolution. + + … thus, treat "elapsed time" and the thresholds as floating point values. + + * plugins/check_pgsql.c: check_pgsql: Leave 'min' value in query + perfdata empty. + + There is no reasonable default value for that. + +2011-04-07 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Updated copyright. + + * plugins/check_pgsql.c: check_pgsql: Added support for the -o command + line option. + + This option may be used to specify further connection parameters to be passed + to PQconnectdb(). For example, this may be used to specify a service name in + pg_service.conf to be used for additional connection parameters: -o + 'service=' or to specify the SSL mode: -o 'sslmode=require'. + + See the chapter "libpq - C Library" in the PostgreSQL manual for details. + + * plugins/check_pgsql.c: check_pgsql: Removed -4/-6 flags from help + output. + + These options are not currently supported. + + * plugins/check_pgsql.c: check_pgsql: Allow UNIX socket directories as + hostname as well. + + PostgreSQL accepts the directory name of its UNIX socket as hostname as well, + e.g. /var/run/postgresql/. + + * plugins/check_pgsql.c: check_pgsql: Use PQconnectdb() rather than + PQsetdbLogin(). + + This is more flexible and the recommended way to connect to a PostgreSQL + database. + + Also, the verbose output now includes detailed information about the + connection. + +2011-04-06 Sebastian Harl + + * plugins/check_pgsql.c: check_pgsql: Fixed query perfdata output for + empty warn/crit ranges. + + Previously, "(null)" was printed (when using GNU's libc). This has been + changed to print the empty string instead. + + * plugins/check_pgsql.c: check_pgsql: Added support for executing + queries. + + The query result (the double value of the first column in the first row, to be + precise) will be checked against threshold ranges specified using the -C and + -W options. + + Note that this also allows to query PostgreSQL internal values using the + information available from the database daemon's "statistics collector" -- see + the chapter "Monitoring Database Activity" in the PostgreSQL manual for + details. + +2012-07-04 Holger Weiss + + * NEWS: Mention the new check_dbi plugin + +2012-07-04 Eric Stanley + + * plugins/check_smtp.c: Re-added missing variable declarations to + check_smtp.c + + A recent update removed the declarations for a couple variables in + check_smtp.c that are still being used, which caused a failure + in the compilation of check_smtp.c. This commit restores those variable + declarations so the check_smtp.c will again compile. + +2012-06-29 Holger Weiss + + * plugins/check_smtp.c: check_smtp: Remove a comment regarding MAIL FROM + + Earlier versions of check_smtp generated an (invalid) "MAIL FROM" + command without arguments by default. These days, a "MAIL FROM" command + is only sent if the --from option is specified. + + This commit removes a comment which explains the old behaviour, and it + updates a variable name accordingly. + + * plugins/check_smtp.c: check_smtp: Fix help and usage output regarding + -R + + * NEWS, THANKS.in: NEWS, THANKS: Mention Anders Kaseorg's changes + +2012-06-29 Anders Kaseorg + + * plugins/check_smtp.c: check_smtp: Fix strcat overflows + + * contrib/check_http-with-client-certificate.c, plugins/check_by_ssh.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.c, plugins/utils.h: + Die when asprintf fails + + Fixes many instances of + warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result] + + * plugins/check_smtp.c: check_smtp: Strip angle brackets from -f + argument, if provided + + Apparently some people used -f '' to work around + the bug I just fixed in the MAIL FROM: command generation. Although + the resulting command wasn't RFC-compliant, it was working with some + MTAs, so let's continue to support this syntax now that we generate + RFC-compliant commands. + +2012-06-28 Anders Kaseorg + + * plugins/check_smtp.c: check_smtp: Change MAIL FROM: command to comply + with the SMTP standard + + Every version of the SMTP standard (from RFC 821 to the current RFC + 5321) requires the address following MAIL FROM: to follow the colon + immediately (with no space) and to be surrounded by angle brackets. + +2012-06-28 Holger Weiss + + * package.def: Remove the package.def file + + The package.def file is not included in release tarballs, and I'm not + aware of anyone (still) using it. + +2012-06-27 Holger Weiss + + * BUGS: Remove #990948 from the BUGS file + + Issue #990948 has been fixed by commit + 0892c4ac28c4c2e3b6275187f845813b4cd6d320. + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: + Prepare for the 1.4.16 release + + * plugins/check_tcp.c: check_tcp: Print performance data even with -D + + When using the 1.4.15 release of the Nagios Plugins, a command such as + + check_tcp -H pop.example.com -p 995 -D 14 + + usually produced two lines of output, e.g.: + + OK - Certificate will expire on 12/13/2014 23:59. + TCP OK - 0.009 second response time on port 995|time=0.008849s;;;0.000000;10.000000 + + The second line was removed by 4d06603060fc1233861b164870f0d3a2e0d8d2eb. + However, as the old two-line output is a valid (though in this case + unintended) way to spit out performance data, removing the second line + might break current setups. Therefore, we revert to the old behaviour, + at least for the moment. + + The issue was reported by Jochen Bern on the "nagiosplug-devel" mailing + list (Message-ID: <4FEAE812.8030309@LINworks.de>). + + * BUGS: Update the BUGS file + + Remove the bug reports that were closed, and add two new items. + +2012-06-27 Sven Nierlein + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: check_snmp: use + single quotes for perf data labels + +2012-06-26 Sven Nierlein + + * NEWS, THANKS.in, plugins/check_snmp.c, plugins/tests/check_snmp.t: Fix + performance data label containing spaces in check_snmp (Jochen Bern) + + Add --perf-oids option for check_snmp to retain optional 1.4.14 compatibility + +2012-06-26 Holger Weiss + + * THANKS.in: Remove team members from the THANKS file + + The (current and past) team members are listed in the AUTHORS file. + + * AUTHORS, THANKS.in: Add Sven Nierlein to the list of AUTHORS + +2012-06-25 William Leibzon + + * plugins/tests/check_http.t: added test case for certificate checs with + both warning and critical values + +2012-06-25 Sven Nierlein + + * plugins/sslutils.c, plugins/t/check_http.t, plugins/t/check_tcp.t: + check_http: added test for warning thresholds + + fixed typo in sslutils + + * NEWS, THANKS.in: updated changelog + +2012-05-21 William Leibzon + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/netutils.h, plugins/sslutils.c: applied patch that adds both + critical and warning thresholds to certificate expiration checks of + check_tcp, check_http, check_smtp + +2012-06-25 Holger Weiss + + * plugins/check_ping.c: check_ping: Add missing newline to die() calls + + Our die() function expects the caller to append the trailing newline + character. + + * NEWS: Improve the wording a bit + +2012-06-24 Holger Weiss + + * THANKS.in, plugins/check_ping.c: check_ping: Ignore ping(1)'s exit + status + + Don't return a WARNING state if the number of lost packets is greater + than zero but below the specified warning threshold. This happened + because the check_ping plugin used the exit status of the ping(1) + utility. (#3535140 - Tobias Brox) + +2012-06-23 Holger Weiss + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: check_disk_smb: + Add performance data + + (Debian #654259 - Charles-Henri Larose) + +2012-06-22 Holger Weiss + + * plugins/t/check_by_ssh.t: Fix check_by_ssh test for non-Bash login + shells + + In the C shell and in the Z shell, the "?" character must be quoted or + backslash-escaped in order to use it verbatim. Therefore, a command + such as + + check_by_ssh -H test.example.com -l joe echo huh? + + might fail, depending on joe's login shell on test.example.com. + + Just to make sure, this commit removes most punctuation characters from + our test strings. + +2012-06-14 Holger Weiss + + * THANKS.in, plugins-root/check_dhcp.c: check_dhcp: Don't misinterpret + the "siaddr" field + + RFC 2131 (2.) says: "DHCP clarifies the interpretation of the 'siaddr' + field as the address of the server to use in the next step of the + client's bootstrap process." So, we shouldn't interpret this field as + the DHCP server's own address. (#3503921 - Jason Ellison) + +2012-06-13 Holger Weiss + + * NEWS, plugins-root/check_dhcp.c: check_dhcp: Fix handling of "pad" + options + + Don't let "pad" options[*] terminate the parsing of DHCP options. This + bug was triggered by using check_dhcp against Windows 2003 DHCP servers + (see #3503921). + + [*] Cf. RFC 2132, 3.1. + +2012-06-11 Holger Weiss + + * NEWS, THANKS.in, plugins/check_ping.c: Improve parsing of ping6(1) + output + + The ping6(1) implementation provided by Debian's iputils-ping package + may produce output such as the following: + + | 3 packets transmitted, 0 received, +3 errors, 100% packet loss, time 2009ms + + There's a corresponding pattern in check_ping.c:458: + + | "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss" + + Without this fix, the pattern in check_ping.c:456 matched first (as + sscanf(3) interprets "+3" as a match for "%d"): + + | "%*d packets transmitted, %*d received, %d%% loss, time" + + (#1894850 - Debian bug report #514588 - Matej Vela) + + * plugins/sslutils.c: Fix whitespace and capitalization issues + + Fix indentation and whitespace issues, and correct some capitalization + errors in error messages. The behaviour is unchanged. + + * plugins/sslutils.c: Don't use SSLv2 when compiling against GnuTLS + + GnuTLS doesn't support SSL version 2. + +2012-06-08 Sebastian Harl + + * plugins/t/check_dbi.t: t/check_dbi.t: Don't use 'INSERT … VALUES + (a,b), (c,d)' with SQLite3. + + Older versions of SQLite3 don't seem to support that. + +2012-06-08 Sebastian Harl + + * plugins/t/check_dbi.t: Added a few test cases for the check_dbi + plugin. + + All tests use sqlite3. A temporary database is created for the purpose of the + tests. + +2012-06-07 Holger Weiss + + * plugins/check_users.c: check_users: Whitespace fixes, etc. + + * NEWS, THANKS.in: Update NEWS and THANKS w.r.t. check_users change + +2012-04-17 M. Remy + + * plugins/Makefile.am, plugins/check_users.c: check_users: improve + performance + + This patch use the utxent function family to collect the user data. It improve the check speed. + Need a system conforming to POSIX.1-2001. + +2012-06-06 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Hint the user about cause when dbi + init fails. + +2011-04-18 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Added simple regex example to help + output. + + * plugins/check_dbi.c: check_dbi: Added SERVER_VERSION metric. + + This metric compares the database engine server version with the specified + ranges. The version string [[[[A.]B.]C.]D.]E[.] is returned as E + D*100 + + C*10000 + B*1000000 + A*100000000 (see libdbi's dbi_conn_get_engine_version() + documentation). + + * plugins/check_dbi.c: check_dbi: Added -r and -R options. + + These options may be used to specify an extended POSIX regular expression that + is applied to the query result. When using -R, a case-insensitive match is + done. + + The options may not be mixed with -w/-c/-e. + +2011-04-15 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Added -e option. + + This option may be used to specify a string that is expected as the query + return value. The string is compared to the query result using strcmp(). + + The option may not be mixed with -w/-c. + + * plugins/check_dbi.c: check_dbi: Added some examples to the help + output. + + * plugins/check_dbi.c: check_dbi: Added QUERY_TIME metric. + + This metric checks the execution time of the specified query. In case the + query does not return any (parsable) data, this is not treated as an error + when using this metric. + + * plugins/check_dbi.c: check_dbi: Replaced -W/-C with -m. + + The -m option may be used to specify a metric to check the thresholds against. + This is more flexible than --conntime-warning/--conntime-critical (-W/-C) as + it may be extended to support further metrics without introducing tons of + arguments. Also, it does not make much sense to check the conntime and query + result at the same time. + + Currently, the metrics CONN_TIME and QUERY_RESULT are available. + + A query is no longer required unless QUERY_RESULT (the default) is used. + +2011-04-08 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Fixed/improved perfdata output. + + - do not use zero as 'min' value for the query result perfdata + + - added all semicolons + +2011-04-07 Sebastian Harl + + * plugins/check_dbi.c: check_dbi: Check and report the time used by the + query. + + * plugins/check_dbi.c: check_dbi: Added threshold ranges for the + connection time. + + The -W and -C options are used for that. The plugin return value is determined + by the worst check result. + + * plugins/check_dbi.c: check_dbi: Include extra opts in help output. + + * .gitignore, REQUIREMENTS, configure.in, plugins/Makefile.am, + plugins/check_dbi.c: Initial version of the 'check_dbi' plugin. + + This plugin connects to an SQL database using libdbi, thus supporting all + database backends supported by libdbi. It will then issue the specified SQL + query and check the result (the numeric value of the first column of the first + row to be precise) against the specified warning/critical ranges. + + The performance data includes the connection time (µs-resolution as provided + by gettimeofday()) and the query result. + +2012-06-06 Sebastian Harl + + * plugins/sslutils.c: sslutils: Check if OpenSSL supports SSLv2. + + Recent versions/builds seem to disable that feature. + +2012-05-29 Holger Weiss + + * NEWS, THANKS.in, plugins-scripts/utils.sh.in: Mention the check_range + function in NEWS, etc. + +2012-04-18 Alex Griffin + + * plugins-scripts/utils.sh.in: Added check_range shell function to + utils.sh.in + +2012-05-29 Holger Weiss + + * plugins/check_http.c: check_http: Fix -C/--certificate option handling + + The support for specifying the desired SSL protocol version via an + optional -S/--ssl argument broke the -C/--certificate option. This is + fixed now. + +2012-05-28 Holger Weiss + + * plugins/check_http.c: check_http: Don't ignore SSL initialization + errors + + SSL initialization errors are now handled properly by check_http + (#3095106 - Eric Schoeller). + + * NEWS, THANKS.in, plugins/check_http.c, plugins/sslutils.c: Add support + for specifying SSL protocol version + + The check_http -S/--ssl option now takes an optional argument which + specifies the desired SSL/TLS protocol version (#3285367 - Jason Lunn). + +2012-05-07 Holger Weiss + + * NEWS, plugins/sslutils.c: Disable stateless SSL session resumption + + Some versions of OpenSSL fail to negotiate the SSL connection with at + least some versions of Tomcat if stateless SSL session resumption + support (see RFC4507) is enabled: + + | CRITICAL - Cannot make SSL connection + | 140099330348712:error:140943F2:SSL routines:SSL3_READ_BYTES:sslv3 alert unexpected message:s3_pkt.c:1195:SSL alert number 10 + + The problem is reproducible with OpenSSL 1.0.0h, but not with OpenSSL + 0.9.8o-4squeeze12 (as shipped with Debian 6.0.4). We work around it by + disabling the RFC4507 functionality when using OpenSSL versions which + support it. + + Thanks to Dag Bakke for reporting the issue and for giving me access to + a server I could use to reproduce the problem. + +2012-04-17 Holger Weiss + + * .gitignore: Add nagios-plugins.spec file to .gitignore + + The nagios-plugins.spec file is created from nagios-plugins.spec.in and + should be ignored by Git. + +2012-04-17 Jan Wagner + + * NEWS, plugins/check_ping.c: Fix check_ping where output of ping6 when + unreachable (Debian #662638) + +2012-04-09 Holger Weiss + + * NEWS: Mention check_by_ssh -F option in NEWS file + +2012-04-09 Sven Nierlein + + * plugins/check_by_ssh.c, plugins/t/check_by_ssh.t: check_by_ssh: added + -F config file to specify alternative ssh config + +2012-04-06 Eric Stanley + + * Makefile.am, configure.in, nagios-plugins.spec.in, + po/nagios-plugins.pot: Updated to support compiling and building RPM on + AIX. + +2012-02-24 Holger Weiss + + * plugins/check_http.c: Clarify that check_http won't verify + certificates + + Add a note to the --help output which clarifies that check_http doesn't + perform certificate verification (beyond what the "-C" option does). + + (Suggested by Michael Renner in Debian bug report #644627, forwarded by + Jan Wagner.) + + * plugins/check_snmp.c: Cosmetic change + + Replace all occurrences of "strstr(s, "c") == s" with "s[0] == 'c'". + + * plugins/check_snmp.c: Accept multiple labels specified with "-l" + + Fix the code which accepts a comma-separated list of labels specified + via the "-l" option. + + (Spotted by Oskar Liljeblad in Debian bug report #647020, forwarded by + Jan Wagner.) + +2012-02-10 Eric Stanley + + * configure.in, plugins/common.h: Enable compiling on AIX 6.1 + +2012-01-20 Eric Stanley + + * Makefile.am, pkg/solaris/solpkg: Added pst3 to Solaris package. + +2011-12-25 Holger Weiss + + * NEWS, perlmods/Nagios-Plugin-0.34.tar.gz, + perlmods/Nagios-Plugin-0.36.tar.gz: Updated Nagios::Plugin library + +2011-12-16 Eric Stanley + + * Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Commit files + which were inadvertently omitted from the previous commit. + + * pkg/solaris/preinstall: Updated Solaris package creation to newer + standards + + The Solaris package creation has been updated to newer standards to match those + of the NRPE package. The following changes have been made: + - the plugins now install under /opt/nagios + - the name of package is now NGOSplugin + - the files installed are now owned by the nagios user + - the package includes a pre-installation script that creates a nagios user + and a nagios group if one did not previously exist + + * m4/np_mysqlclient.m4: Fixed issue for compiling mysql plugin on + Solaris + + On Solaris, in the case where the mysql libraries were compiled using a + non-gcc compiler, but the plugins are being compiled with gcc, the configure + process would incorrectly determine the MYSQLCFLAGS. This has been corrected + in the m4/np_mysqlclient.m4 file. + +2011-09-07 Holger Weiss + + * plugins-scripts/check_sensors.sh: check_sensors: Use symbolic exit + codes + + Specify the exit codes by using the constants from utils.sh. + + * plugins-scripts/check_sensors.sh: check_sensors: Minor whitespace + fixes + + * NEWS, plugins-scripts/check_sensors.sh: check_sensors: Detect FAULT + status + + Return an UNKNOWN status if a faulty sensor is detected. This can be + suppressed with the new "--ignore-fault" option. + + (Fixes Debian bug #615133, patch suggested by Jan Wagner.) + +2011-09-06 Thomas Guyot-Sionnest + + * plugins/check_radius.c: Make GCC happy + + It won't trust us about msg containing no format string, and fail miserably + when compiled with -Werror=format-security. Reported by spy6 on IRC. + +2011-08-13 Matthias Eble + + * plugins/check_ldap.c: Fix: check_ldap now correctly handles the long + option --hostname for -H + + The undocumented --host has been changed to --hostname which is actually + mentioned in --help. Thanks to lgarrett (#3191388) + +2011-07-15 Ton Voon + + * NEWS, plugins/check_smtp.c, plugins/check_tcp.c: Fix check_smtp and + check_tcp where duplicate messages were displayed for certificate errors + (Opsview team) + + * NEWS, plugins/check_smtp.c: New option to check_smtp to ignore + failures when sending QUIT (#3358348 - Duncan Ferguson) + +2011-04-28 Sebastian Harl + + * NEWS, THANKS.in, plugins-root/check_icmp.c: check_host: Allocate a + large-enough buffer for the host table. + + When specifying a host-name on the command line, each of its IPs is added to + the host table (and each one is pinged). So, the buffer has to be large enough + to hold all of the respective host objects. (argc - 1) only fits hosts with a + single IP. + + Thanks to Max Kosmach for reporting this in Debian bug #623702. + +2011-03-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ssh.c: Add perfdata to check_ssh + (#3244097 - Marco Beck) + +2011-02-08 Holger Weiss + + * plugins/check_smtp.c: check_smtp: Abort on missing/unexpected greeting + + Abort immediately if we don't receive a server greeting or if the + greeting doesn't contain the "--expect"ed string (by default: "220") + instead of blindly sending the EHLO/HELO line. + + Spotted by Daniel Piddock, see Debian bug report #611914. + +2011-02-04 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/sslutils.c, plugins/t/check_http.t, + plugins/tests/check_http.t: check_http: check for and print the + certificate cn + + This patch adds a check for the certificate cn (hostname) to normal + certificate checks. It returns CRITICAL if th cn is missing, otherwise it + prints it in the normal output. + + Patch by Stéphane Urbanovski + +2011-01-21 Ton Voon + + * NEWS, plugins/check_procs.c, plugins/tests/check_procs.t: Fix for + regex input of '|', being output causing problems with Nagios' parsing + of + performance data. Now replaced with ',' + +2011-01-05 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: Test updates... + + 1. Timetick test could fail with uptime > 115 days. Thresholds are + double type, so it's safe to put a large number even for 32bit systems. + 2. Add a test based on an invalid bug report, worthy anyway. + +2011-01-01 Thomas Guyot-Sionnest + + * tools/sfsnapshot-upload: Update the README text + + * NEWS, plugins/check_http.c: Make check_http use standard threshold + functions + + This enables floating point and ranges, and make the code more standard. + +2010-12-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ldap.c: Fix check_ldap overriding the port when + --ssl was specified after -p + +2010-11-30 Thomas Guyot-Sionnest + + * plugins/tests/check_http.t, plugins/tests/check_snmp.t: Fix minor test + issues + + My Test::More wouldn't print the total number of tests anymore, moving + the plan at the top appears to fix it. + + At the same time I made check-http.t eval the special modules so it can + skip the tests instead of failing. + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t: Revert + "check_snmp now considers strings returned by SNMP that contain just" + + This reverts commit 896962a1ad1b7d7c75d42c565b06cc799feb0a7c. + + Conflicts: + + NEWS + plugins/tests/check_snmp.t + + Notes: + Reverting because I rebased a patch that was doing the same thing, plus + fixing more related regressions, and both didn't work together. + I kept the tests intact except for one that wouldn't pass on 1.4.14 + either + + * plugins/tests/check_snmp.t: State-based tests enhancements + + - Use /var/tmp for state if no state dir environment variable is set, + this avoid the need for a writable localstatedir during tests. + - Use "rm -f", mostly to avoid printing out garbage of the directory + doesn't exists + + * NEWS, plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Remove + that is_numeric madness + + Original patch to make Timeticks works as in check_snmp v1.4.14, it turns + out is_numeric isn't so useful and treating all types as numeric works + best for backwards-compatibility. This is how it used to work in 1.4.14. + + As a special case, I also make calculate_rate look up for numeric values + as it would otherwise return the last value instead. + +2010-11-28 Matthias Eble + + * plugins-scripts/t/check_disk_smb.t: add test cases for check_disk_smb + + * NEWS, plugins-scripts/check_disk_smb.pl: check_disk_smb now handles + NT_STATUS_ACCESS_DENIED properly (Debian #601696) + + * NEWS, plugins-scripts/check_disk_smb.pl: Make check_disk_smb accept + spaces in share names (#990948, #1370031, Debian #601699) + +2010-11-15 Matthias Eble + + * NEWS, lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: Fix + check_disk free space calculation if blocksizes differ within a disk + group (Bekar - #2973603) + + Various values (dused_pct, dfree_pct, inodes_free, inodes_total, ...) are now carried in + the parameter_list structure. Assignments have been moved to a subroutine preventing + code redundancies. + Group metrics are now calculated based on units rather than blocks. This fixes freespace calculation + when blocksizes differ within a group. + +2010-11-15 nagios + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: check_snmp now considers strings + returned by SNMP that contain just + numbers (according to strtod) to be a numeric value for threshold and + performance data + +2010-10-16 Thomas Guyot-Sionnest + + * NEWS: Update NEWS for last commit + +2010-10-13 Thomas Guyot-Sionnest + + * THANKS.in, plugins/check_nt.c: check_nt: make UPTIME accept + warning/critical levels + + Patch originally by Ryan Kelly + +2010-10-11 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: sfsnapshotgit: Better handling of remote refs + + This commit allow to track branches from unusually-named remote refs and + makes possible using external remotes (other than origin) for snapshots. + +2010-10-05 Thomas Guyot-Sionnest + + * contrib/check_linux_raid.pl: Patch for check_linux_raid with on + linear/raid0 arrays + + Fixes bug #3049988, Debian bug #579049 + +2010-08-31 Ton Voon + + * plugins/check_http.c: Fix typos in -f help text + +2010-07-27 Holger Weiss + + * COPYING: Update the COPYING file to the GPLv3 + + We switched to the GPLv3 early in 2008, but we forgot to update the + COPYING file accordingly. + +2010-07-27 Ton Voon + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: + 1.4.15 prep + +2010-07-14 Ton Voon + + * tools/sfsnapshot-upload: Added text re: MD5SUM updates in nightlies, + but tarballs not + +2010-07-09 Thomas Guyot-Sionnest + + * plugins/check_snmp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: Fix + --help output when MAX_OIDS is altered. + +2010-07-07 Ton Voon + + * NEWS, plugins/check_disk.c: Fix examples in check_disk, where it + implied was possible to suffix unit values to warn/crit parameters + + * NEWS, THANKS.in, plugins-scripts/check_ifstatus.pl: Allow + check_ifstatus to accept version=2c + +2010-07-02 Thomas Guyot-Sionnest + + * NEWS, lib/utils_cmd.c: Fix cmd_run overwriting the environment + + Some commands need the environment to function properly. One such + example is check_ssh and check_by_ssh when a SOCKS proxy is required. + + This patch use setenv and extern char **environ to alter and pass the + new environment to the child process Those modules have been added to + Gnulib for portability. + + * gl/Makefile.am, gl/m4/gnulib-cache.m4: Import the environ module from + gnulib (86ba51) + +2010-07-02 Holger Weiss + + * tools/git-notify: git-notify: Be careful with "--no-merge" + + The "-X" option (which asks git-notify to not report merge commits) was + implemented by setting the "--no-merge" option on each invocation of + git-rev-list(1). However, we do not only use git-rev-list(1) to get the + list of new commits, but also to check whether the old branch head (or + tag) is a parent of the new branch head (or tag). For this latter + check, the "--no-merge" option should not be set; otherwise, git-notify + would be fooled to believe that the branch has been rewritten if the old + head was a merge commit. + +2010-06-30 tonvoon + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Corrected + rate_multiplier calculation + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Removed suffix of + "-rate" and let user decide label via --label + + * plugins/check_snmp.c, plugins/tests/check_snmp.t: Tests for + --rate-multiplier option + +2010-06-30 Ton Voon + + * plugins/check_snmp.c: Fixed rate-multiplier option + +2010-06-25 tonvoon + + * lib/tests/Makefile.am: Add test file directory + +2010-06-24 Ton Voon + + * lib/tests/test_utils.c, lib/utils_base.c: Cleanup some warnings + displayed from IRIX tinderbox server + + * gl/Makefile.am, gl/m4/eealloc.m4, gl/m4/environ.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, gl/m4/malloca.m4, + gl/m4/setenv.m4, gl/malloca.c, gl/malloca.h, gl/malloca.valgrind, + gl/setenv.c, gl/unsetenv.c: Added unsetenv and setenv from gnulib + + * gl/Makefile.am, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/strsep.m4, gl/strsep.c: Added strsep to gnulib, for check_snmp.c + +2010-06-23 tonvoon + + * NEWS, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl, po/de.po, po/fr.po, + po/nagios-plugins.pot: Added option to invert search results + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: Display + missing search string and URL when failed (Duncan Ferguson #2999924) + +2010-06-17 Ton Voon + + * NEWS, build-aux/c++defs.h, build-aux/warn-on-use.h, gl/Makefile.am, + gl/alloca.c, gl/config.charset, gl/error.c, gl/getopt.c, + gl/getopt_int.h, gl/localcharset.c, gl/m4/asm-underscore.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/gnulib-cache.m4, + gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, gl/m4/iconv.m4, + gl/m4/intl.m4, gl/m4/lib-link.m4, gl/m4/netdb_h.m4, gl/m4/onceonly.m4, + gl/m4/po.m4, gl/m4/printf.m4, gl/m4/sha1.m4, gl/m4/sockpfaf.m4, + gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/string_h.m4, gl/m4/strnlen.m4, + gl/m4/time_h.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/visibility.m4, gl/netdb.in.h, gl/regex_internal.c, + gl/regex_internal.h, gl/sha1.c, gl/sha1.h, gl/stdbool.in.h, + gl/stdio-write.c, gl/stdio.in.h, gl/strerror.c, gl/string.in.h, + gl/sys_stat.in.h, gl/time.in.h, gl/unistd.in.h, gl/vasnprintf.c, + gl/verify.h, gl/wchar.in.h, lib/Makefile.am, lib/tests/Makefile.am, + lib/tests/test_utils.c, lib/tests/var/.gitignore, lib/tests/var/baddate, + lib/tests/var/missingdataline, lib/tests/var/oldformat, + lib/tests/var/statefile, lib/utils_base.c, lib/utils_base.h, + plugins/Makefile.am, plugins/check_snmp.c, plugins/tests/check_snmp.t, + plugins/tests/check_snmp_agent.pl: Added state retention APIs. + Implemented for check_snmp with --rate option. + + See http://nagiosplugin.org/c-api-private for more details on the API. + + Also updated check_snmp -l option to change the perfdata label. + +2010-06-18 Thomas Guyot-Sionnest + + * NEWS: NEWS entry for last commit + +2009-08-05 Thomas Guyot-Sionnest + + * configure.in: Attempt at detecting 64bit compilation flags between + gcc, old, and new versions of sun cc + + Gcc accepts -m64, just as newer version of Suncc. + Older Suncc required -xarch=v9 (SPARC) or -xarch=amd64 (x86-64) to generate 64bit code. + +2010-05-08 Thomas Guyot-Sionnest + + * plugins/check_smtp.c: Add missing --fqdn help (Jan Wagner) + +2010-04-28 Thomas Guyot-Sionnest + + * plugins/utils.h, po/de.po, po/fr.po, po/nagios-plugins.pot: Update + extra-opts help text based on ML agreement + + * .gitignore, tools/distclean: use git-clean when possible + + git-clean is much faster and more reliable... + + Also add confdefs.h in gitignore, although this file is normally removed + at the end of the configure script. + + * build-aux/ltmain.sh, gl/m4/libtool.m4, gl/m4/ltoptions.m4, + gl/m4/ltsugar.m4, gl/m4/ltversion.m4, gl/m4/lt~obsolete.m4: Update + libtool + + Nagios-plugins wouldn't compile on Ubuntu 10.04 (Lucid) with the old libtool + +2010-04-22 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: Add newline after "Usage:" in --help + + * plugins/check_cluster.c: Split long line in check_cluster --help + +2010-04-21 Thomas Guyot-Sionnest + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Update French translations + with extra-opts change + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/utils.h: Standardize the extra-opts notes + + * NEWS, plugins/tests/check_snmp.t: Fix tests and update NEWS file + +2010-04-15 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Replace the lousy multiline parser with a robust + one. + + This one counts double quotes and backslashes so it should handle any + level of escaping. + +2009-09-17 Thomas Guyot-Sionnest + + * plugins/check_snmp.c, plugins/tests/check_snmp_agent.pl: Attempt at + fixing check_snmp multiline output: + + This patch tries to detect and output nicely multi-line strings. This + method is broken by design; only a count of double-quotes and escapes + could work in every situation. + +2010-04-15 tonvoon + + * NEWS, perlmods/Nagios-Plugin-0.27.tar.gz, + perlmods/Nagios-Plugin-0.34.tar.gz: Updated Nagios::Plugin library + +2010-04-14 Holger Weiss + + * tools/git-notify: git-notify: Fix the ordering of commits + + If notifications for multiple commits are created, sort them + chronologically instead of in reverse chronological order. + +2010-04-14 Thomas Guyot-Sionnest + + * NEWS, plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.h, po/POTFILES.in, + po/de.po, po/fr.po, po/nagios-plugins.pot: Fix translations when + extra-opts aren't enabled + + Bug #2832884 reported problem with translations outputting pot file + headers. This is caused by "" matching the header of the translation + files. + + This patch moves gettext macros inside utils macros and update some + french translations. + + * plugins/check_ntp.c, plugins/negate.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: Update french translation (fix all fuzzy's) + + * NEWS, THANKS.in, plugins/check_radius.c: Fix check_radius returning OK + on unexpected results + + REJECT_RC is defined on some radiusclient versions and differenciates + between auth errors and bad responses. This patch will affect only the + behaviour of those clients exporting REJECT_RC. + + In addition, unexpected return codes are now handled properly and + return UNKNOWN. + + * NEWS: Typo + +2010-04-08 Thomas Guyot-Sionnest + + * NEWS, plugins-root/Makefile.am, plugins-root/pst3.c: pst3.c must not + use nagiosplug/gnulib includes + +2010-04-07 Thomas Guyot-Sionnest + + * .gitignore, build-aux/arg-nonnull.h, build-aux/c++defs.h, + build-aux/config.rpath, build-aux/mkinstalldirs, + build-aux/warn-on-use.h, gl/Makefile.am, gl/alignof.h, gl/alloca.c, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/base64.c, gl/base64.h, gl/basename-lgpl.c, gl/basename.c, gl/btowc.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/close-hook.c, gl/close-hook.h, gl/config.charset, gl/creat-safer.c, + gl/dirname-lgpl.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/dup2.c, gl/errno.in.h, gl/error.c, gl/error.h, gl/exitfail.c, + gl/exitfail.h, gl/fcntl--.h, gl/fcntl-safer.h, gl/fcntl.c, + gl/fcntl.in.h, gl/fd-safer.c, gl/float+.h, gl/float.in.h, gl/floor.c, + gl/floorf.c, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, gl/full-read.h, + gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, gl/getaddrinfo.c, + gl/getdtablesize.c, gl/gethostname.c, gl/getloadavg.c, gl/getopt.c, + gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, gl/gettext.h, + gl/inet_ntop.c, gl/intprops.h, gl/langinfo.in.h, gl/localcharset.c, + gl/localcharset.h, gl/locale.in.h, gl/m4/00gnulib.m4, gl/m4/alloca.m4, + gl/m4/arpa_inet_h.m4, gl/m4/base64.m4, gl/m4/btowc.m4, + gl/m4/c-strtod.m4, gl/m4/cloexec.m4, gl/m4/codeset.m4, gl/m4/dirname.m4, + gl/m4/dos.m4, gl/m4/double-slash-root.m4, gl/m4/dup2.m4, + gl/m4/errno_h.m4, gl/m4/error.m4, gl/m4/exitfail.m4, + gl/m4/extensions.m4, gl/m4/fcntl-o.m4, gl/m4/fcntl-safer.m4, + gl/m4/fcntl.m4, gl/m4/fcntl_h.m4, gl/m4/float_h.m4, gl/m4/floorf.m4, + gl/m4/fstypename.m4, gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, + gl/m4/getdtablesize.m4, gl/m4/gethostname.m4, gl/m4/getloadavg.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/langinfo_h.m4, gl/m4/lcmessage.m4, + gl/m4/lib-ld.m4, gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, + gl/m4/localcharset.m4, gl/m4/locale-fr.m4, gl/m4/locale-ja.m4, + gl/m4/locale-zh.m4, gl/m4/locale_h.m4, gl/m4/lock.m4, gl/m4/longlong.m4, + gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, gl/m4/math_h.m4, gl/m4/mbrtowc.m4, + gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, gl/m4/memchr.m4, gl/m4/mktime.m4, + gl/m4/mmap-anon.m4, gl/m4/mode_t.m4, gl/m4/mountlist.m4, + gl/m4/multiarch.m4, gl/m4/netdb_h.m4, gl/m4/netinet_in_h.m4, + gl/m4/nl_langinfo.m4, gl/m4/nls.m4, gl/m4/onceonly.m4, gl/m4/open.m4, + gl/m4/po.m4, gl/m4/printf-posix.m4, gl/m4/printf.m4, gl/m4/progtest.m4, + gl/m4/regex.m4, gl/m4/safe-read.m4, gl/m4/safe-write.m4, + gl/m4/servent.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/sockets.m4, gl/m4/socklen.m4, gl/m4/sockpfaf.m4, gl/m4/ssize_t.m4, + gl/m4/stat.m4, gl/m4/stdbool.m4, gl/m4/stddef_h.m4, gl/m4/stdint.m4, + gl/m4/stdint_h.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, + gl/m4/strerror.m4, gl/m4/string_h.m4, gl/m4/strndup.m4, + gl/m4/strnlen.m4, gl/m4/strstr.m4, gl/m4/sys_socket_h.m4, + gl/m4/sys_stat_h.m4, gl/m4/threadlib.m4, gl/m4/time_h.m4, + gl/m4/time_r.m4, gl/m4/timegm.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/warn-on-use.m4, gl/m4/wchar_h.m4, gl/m4/wchar_t.m4, + gl/m4/wcrtomb.m4, gl/m4/wctype_h.m4, gl/m4/wint_t.m4, gl/m4/write.m4, + gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, gl/malloc.c, + gl/math.in.h, gl/mbrtowc.c, gl/mbsinit.c, gl/memchr.c, + gl/memchr.valgrind, gl/mktime-internal.h, gl/mktime.c, gl/mountlist.c, + gl/mountlist.h, gl/netdb.in.h, gl/netinet_in.in.h, gl/nl_langinfo.c, + gl/open-safer.c, gl/open.c, gl/pipe-safer.c, gl/printf-args.c, + gl/printf-args.h, gl/printf-parse.c, gl/printf-parse.h, gl/ref-add.sin, + gl/ref-del.sin, gl/regcomp.c, gl/regex.c, gl/regex.h, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, + gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, gl/size_max.h, + gl/snprintf.c, gl/sockets.c, gl/sockets.h, gl/stat.c, gl/stdbool.in.h, + gl/stddef.in.h, gl/stdint.in.h, gl/stdio-write.c, gl/stdio.in.h, + gl/stdlib.in.h, gl/str-two-way.h, gl/strdup.c, gl/streq.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strndup.c, + gl/strnlen.c, gl/strstr.c, gl/sys_socket.in.h, gl/sys_stat.in.h, + gl/time.in.h, gl/time_r.c, gl/timegm.c, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd.in.h, gl/vasnprintf.c, gl/vasnprintf.h, + gl/vasprintf.c, gl/verify.h, gl/vsnprintf.c, gl/w32sock.h, + gl/wchar.in.h, gl/wcrtomb.c, gl/wctype.in.h, gl/write.c, + gl/xalloc-die.c, gl/xalloc.h, gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, + gl/xstrndup.h, tools/setup: Sync with the latest Gnulib code (177f525) + +2010-04-13 Holger Weiss + + * plugins/check_ntp_peer.c: Fix typo + +2010-04-12 Holger Weiss + + * contrib/check_linux_raid.pl: Fix Debian bug #574612: Return WARNING on + rebuild + + Let check_linux_raid return a WARNING instead of an OK state during + volume recovery. + + See: http://bugs.debian.org/574612 + + (Fixed by Christoph Martin, forwarded by Jan Wagner.) + + * contrib/check_linux_raid.pl: Fix Debian bug #534604: Checking md10 and + above + + | check_linux_raid malfunctions if system has software RAID devices with + | two or more digits. For example, for system having /dev/md10, + | /dev/md11 etc, the plugin returns 'UNKNOWN' in automatic mode (if RAID + | devices are manually specified it works). Also, if system has both + | one-digit, and two-digit RAID devices, the two-digit devices are + | silently ignored in checks, which is even more problematic. + + [ http://bugs.debian.org/534604 ] + + (Fixed by Matija Nalis, forwarded by Jan Wagner.) + + * NEWS, plugins-scripts/check_ircd.pl: Fix Debian bug #545940: Failure + when run via ePN + + If Perl's "shift" function is called outside of a subroutine and without + any argument, it usually shifts @ARGV. However, if a plugin is executed + via ePN, such a call will shift @_ instead, so we must explicitly + specify @ARGV for this to work as expected. + + This fixes Debian bug #545940, see: http://bugs.debian.org/545940 + + Commit de7191e3424e02ba278a39b86e8b1906a25d0362 fixed the same issue for + check_disk_smb. + + (Reported by Hendrik Jaeger, forwarded by Jan Wagner.) + +2010-04-11 Holger Weiss + + * NEWS, plugins/check_radius.c: Fix Debian bug #482947: No + --nas-ip-address option + + | check_radius doesn't seem to provide any way to modify the + | NAS-IP-Address attribute that it uses in the packets it sends, but it + | does so for NAS-Identifier. + | + | Instead, it hardcodes the IP address that it gets from the + | rc_own_ipaddress() library call, and that in turn translates into + | calling gethostbyname() on the result of uname(). This call can easily + | fail, and its result can easily be unsuitable - for example when the + | Nagios instance uses its own virtual host, and you don't want the + | original system hostname leaked to the RADIUS servers you monitor with + | this. + | + | Furthermore, this behaviour is inconsistent with RFC 2865, which + | defines the two attributes as analogous and never suggests hardcoding + | the value of either of them in client software. + + Therefore, this commit adds the "-N, --nas-ip-address" option which + allows for specifying the value of the NAS-IP-Address attribute. + + | I've also noticed that the original code for NAS-IP-Address hardcoding + | is broken in its error handling - it does "return (ERROR_PC)", which + | is meaningless in the context of check_radius.c. That actually seems + | to be copy&waste from radiusclient-0.3.2/src/radexample.c. :) I fixed + | that. + | + | While debugging, I also took the opportunity to decouple the + | nas-identifier rc_avpair_add() instance from the initial three, + | because this is just bad practice to lump a fourth optional attribute + | into the same block with the required attributes, the error handling + | for which is throwing the same daft message "Out of Memory?"... + + [ http://bugs.debian.org/482947 ] + + (Contributed by Josip Rodin, forwarded by Jan Wagner.) + + * NEWS, plugins/check_ldap.c: Fix Debian bug #479984: Allow empty LDAP + base + + The check_ldap plugin did not allow for specifying an empty LDAP base. + + See: http://bugs.debian.org/479984 + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * plugins/check_http.c: Fix Debian bug #460097: check_http -M broken + + See: http://bugs.debian.org/460097 + + One instance of this bug has already been fixed in commit + 888358122004b9571c8fbdfa52ceee1ba5e5f4f2. + + (Fixed by Hilko Bengen, forwarded by Jan Wagner.) + + * plugins-scripts/check_disk_smb.pl: Fix Debian bug #478942: Fragile + argument passing + + Fix some problems regarding the way check_disk_smb passes command line + arguments to smbclient(1). + + | It runs: + | + | $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup \ + | -U $user $smbclientoptions -I $address -c ls/; + | + | [...] + | + | The documentation says that if the password is not passed, it + | defaults to "". That is not true above, as $pass expands to + | nothing which leaves no argument at all (instead of an empty + | argument) so is different from providing with an empty password + | or with the -N option. + | + | Also, if the password starts with "-", you're in trouble, that's + | why -U $user%$pass may be prefered. + | + | Also, the doc says that if $user is not provided, then it + | defaults to "guest" but the problem is that if it is provided + | but empty, it is changed to "guest" as well, which prevents us + | from querying hosts that don't do user authentication. + + [ http://bugs.debian.org/478942 ] + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: Fix Debian bug + #478906: Failure when run via ePN + + | When perl plugin scripts are run with the embedded perl interpreter in + | nagios3, the "shift" perl command doesn't shift @ARGV, but @_ (which + | happens to contain the same thing as @ARGV at the time the script was + | started). + | + | [...] + | + | A fix is to replace all the instances of "shift" with "shift @ARGV". + + [ http://bugs.debian.org/478906 ] + + (Fixed by Stephane Chazelas, forwarded by Jan Wagner.) + + * THANKS.in, plugins/check_ldap.c: Fix Debian bug #463322: Use + deprecated libldap API + + | Our automated build log filter[1] detected a problem that is likely to + | cause your package to segfault on architectures where the size of a + | pointer is greater than the size of an integer, such as ia64 and + | amd64. + | + | This is often due to a missing function prototype definition. For + | more information, see [2]. + | + | Function `ldap_init' implicitly converted to pointer at + | check_ldap.c:124 + | + | [1] http://people.debian.org/~dannf/check-implicit-pointer-functions + | [2] http://wiki.debian.org/ImplicitPointerConversions + | + | The libldap API has been updated and many functions used by the ldap + | plugin are now deprecated. This package should either update to the + | new API or define LDAP_DEPRECATED to continue using the deprecated + | interfaces. + | + | This patch implements the lazy solution. + + [ http://bugs.debian.org/463322 ] + + (Contributed by Dann Frazier, forwarded by Jan Wagner.) + + * NEWS, THANKS.in, plugins-scripts/check_disk_smb.pl: Fix Debian bug + #425129: SMB guest mode won't work + + | The check_disk_smb plugin purports to support guest users, but it + | doesn't work out, because it doesn't specify the -N command line + | option to smbclient when no password is specified, making smbclient + | stop and ask. + + [ http://bugs.debian.org/425129 ] + + (Fixed by Josip Rodin, forwarded by Jan Wagner.) + + * plugins/check_game.c: Fix Debian bug #307905: Incorrect usage output + + The usage output of check_game was wrong, see: + + http://bugs.debian.org/307905 + + (Fixed by Sean Finney, forwarded by Jan Wagner.) + + * NEWS, plugins-scripts/check_disk_smb.pl: check_disk_smb: Allow for + specifying an IP address + + Add the "-a, --address option" which allows for specifying the IP + address of the server to connect to. If this option is used, the IP + address will be handed over to smbclient(1)'s "-I" option. (Contributed + by Sean Finney, forwarded by Jan Wagner.) + +2010-04-06 Thomas Guyot-Sionnest + + * NEWS: check_http: Add warning about SNI not enabled by default anymore + +2010-04-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: Fix regression in check_http ssl checks on + some servers + + The fix is making SNI an option. + +2010-03-31 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: check_snmp: Update last patch to copy value + verbatim + + Rework last patch, copying the converted portion of the string rather + than re-converting it. This is safer for backwards-compatibility as the + value is never modified. + +2010-03-30 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c: check_snmp: Fix regression introduced in + #1867716 + + Bug #1867716 fixed what it meant to fix: broken perfdata strings. + Unfortunately some users relied on half-broken perfdata string where at + least the first token was OK. This patch do a two-way conversion + (string to double then back to string) instead and use the conversion + result for the performance data. + + A possible caveat is that the string may change where it normally + shouldn't but the result should be somewhat similar. + +2010-03-27 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ide_smart.c: Fix compilation with GCC + 2.96 (Konstantin Khomoutov - #2977105) + +2010-03-18 Holger Weiss + + * NEWS, plugins/check_ntp_peer.c, plugins/t/check_ntp.t: Let + check_ntp_peer check the number of truechimers + + Add support for checking the number of usable time sources (i.e., the + number of peers which are classified as so-called "truechimers" by NTP's + intersection algorithm). The new "-m" and "-n" options allow for + specifying the according WARNING and CRITICAL thresholds (and thereby + activating the truechimers check), respectively. + +2010-03-16 Thomas Guyot-Sionnest + + * NEWS: Typo in NEWS + +2010-03-15 Ton Voon + + * doc/developer-guidelines.sgml: Corrected example + +2010-02-26 Ton Voon + + * NEWS, THANKS.in, plugins/check_http.c: Fix memory leak in check_http + for large pages (Jimmy Bergman - #2957455) + +2009-12-07 Holger Weiss + + * tools/git-notify, tools/git-post-receive-hook: git-notify: Pipe + e-mails directly to sendmail(8) + + Use sendmail(8) instead of mail(1) in order to be able to set the + "Content-Type" header field on systems where the available mail(1) + command doesn't allow for setting it. This makes the "-H" flag (cf. + commit 71350c5a) unnecessary. + +2009-12-06 Holger Weiss + + * tools/git-notify, tools/git-post-receive-hook: Enable CIA's commit + notifications + + We now use CIA's service to send commit notifications to IRC. They are + currently sent to the #Nagios-Devel channel on Freenode. See: + + http://cia.vc/stats/project/nagiosplug/ + http://cia.vc/account/bots/15699/ + +2009-12-04 Thomas Guyot-Sionnest + + * NEWS, configure.in: Detect arguments passed via --with-ping[6]-command + (#2908236) + + * configure.in: Whitespace fixes + +2009-12-02 Thomas Guyot-Sionnest + + * plugins/check_http.c: Fix short help using "warn" for the -f option + instead of "warning" (onredirect). + +2009-11-19 Ton Voon + + * tools/sfsnapshot-upload: Updated link to sfsnapshotgit + +2009-11-18 Thomas Guyot-Sionnest + + * doc/developer-guidelines.sgml: Update developer guideline regarding + CVS Commits + (mostly for testing my snapshot script, though it had to be updated anyway) + +2009-11-11 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: Fix fetching of remote branches + +2009-11-11 dermoth + + * tools/sfsnapshot-upload, tools/sfsnapshotgit: Many fixes to snapshot + scripts + + sfsnapshotgit: + - Use fetch/reset instead to pull to avoid merges on forced updates + + sfsnapshot-upload: + - Fix link deletion walking the entire home dir + - Allow CLEAN_TIME=0 (no retention) + - Re-add per-branch links when CLEAN_TIME > 0 + - Add many comments + +2009-11-07 Holger Weiss + + * tools/git-post-receive-hook, tools/git-update-mirror: Git commit + notifications via post-receive hook + + Now that we moved our Git repositories to SourceForge, we don't need to + maintain local clones for generating commit notifications anymore, as + SourceForge provides shell access to the repositories. Instead, we now + run git-notify as a post-receive hook on the SourceForge server. + Actually, we use a wrapper which executes git-notify with the desired + options and which makes it easy to add other post-receive hooks in the + future. + + * tools/git-notify: git-notify: Support SourceForge repositories + + The Gitweb URLs for repositories hosted by SourceForge are slightly + different than other Gitweb URLs. The correct URL cannot be specified + via "-u" if we append "/$repos_name.git/?" to that URL as we usually do. + If the new "-S" flag is specified or "notify.sourceforge" is set, we'll + append "/$repos_name;" instead, which makes the "-u" option usable for + SourceForge repositories. + + * tools/git-notify: git-notify: Optionally call mail(1) without "-a" + + Not all mail(1) implementations support specifying additional header + fields via "-a": with some, this flag is used for attaching files, + others don't provide an "-a" flag at all (this is true for the /bin/mail + utility currently installed on the SourceForge servers, for example). + We now provide the "-H" flag and the "notify.legacyMail" configuration + key for these cases. + + * tools/git-notify: git-notify: Polish up the "tag notifications" + + Use better labels for the tag ref and the SHA1 name of the tag object. + + * tools/git-notify: git-notify: Distinguish between tag types + + Distinguish between annotated tags and lightweight tags. In the former + case, send an annotated "tag notification", in the latter case, send a + "ref change notification" (as we did in both cases before). + + * tools/git-notify: git-notify: Fix "global" notifications + + If the number of commits included with a single push exceeds the maximum + specified via "-n", a single notification will be generated instead of + individual e-mails. For listing the commits within such a notification, + git-rev-list(1)'s "--pretty" option is used. This yields output which + the git_rev_list() subroutine didn't accept. That's now fixed. + + * tools/git-notify: git-notify: Optionally [tag] the subject + + If the new "-T" option is specified or "notify.emitRepository" is set, + the subject of e-mail notifications will be prefixed with [], where + is the name of the updated repository. + + * tools/git-notify: git-notify: Optionally omit the author name + + If the new "-A" option is specified (or "notify.omitAuthor" is set), the + author name will be omitted from the subject of e-mail notifications. + + * tools/git-notify: git-notify: Make abbreviating Gitweb URLs optional + + The SHA1 object name part of Gitweb URLs is now only shortened if the + user requested this by specifying the new "-z" option (or by setting + "notify.shortURLs"). + + While at it, also shorten the additional URL which references a diff in + e-mail notifications which don't include that diff inline because its + size exceeds the maximum number of bytes specified via "-s". + + Note that while the abbreviated SHA1 object names will be unique at push + time, this cannot be guaranteed for the future, so the shortened URLs + might break some day. + + * tools/git-notify: git-notify: Make showing the committer optional + + Only the author's name and address will now be mentioned in a commit + notification by default. However, if the "-C" option is specified (or + "notify.showCommitter" is set), the committer's name and address will + also be included in the notification if the committer is not the author + of the commit (as we previously did by default). + + * tools/git-notify: git-notify: Make using a state file optional + + Making use of a state file in order to prevent duplicate notifications + is now optional. The user must explicitly specify a file path via the + "-t" option or by setting the git-config(1) variable "notify.statefile" + to activate this functionality. + + * tools/git-notify: git-notify: Don't abort if mail(1) exits non-zero + + As nothing in git-notify depends on the success of the mail(1) call, + don't abort if it fails, just spit out a warning. + + * tools/git-notify: git-notify: Drop the $sent_notices variable + + Now that we don't ignore empty commits anymore, there's no need to keep + track of the number of commits actually notified about, as that will + always be equal to the number of commits returned by get_new_commits(). + + * tools/git-notify: Revert "git-notify: Ignore `empty' commits" + + This reverts commit db63fbfa036f5cd757aedf4547fef9e195a8c285, as it is + no longer needed and we'd like to keep the diff against the git-notify + version maintained by the Wine people as small as possible. The purpose + of db63fbfa was to suppress notifications on empty merge commits, which + can now be requested directly by specifying git-notify's "-X" option. + (Our change was implemented before the "-X" option was available, even + though the Git history suggests otherwise.) + + Conflicts: + + tools/git-notify + + * tools/git-notify: Revert "git-notify: Remove unused [...] code" + + This reverts commit 5445b9769f254781e482062bacc6603a5cd63059. Alexandre + Julliard pointed out that the code in question was used if git-notify + was explicitly called with the SHA1 name of an annotated tag object. At + the moment, the code in question actually _is_ unused due to later + modifications, but it wasn't at the time 5445b976 was committed, and + we'll add further changes so that the code will be used again in the + future. + + Conflicts: + + tools/git-notify + +2009-11-06 Holger Weiss + + * tools/git-notify: git-notify: Minor cosmetic changes + + Fix the description of the "-U" option. + +2009-10-25 Thomas Guyot-Sionnest + + * tools/sfsnapshot-upload: Allow rsyncing to local paths + + * tools/sfsnapshot-upload: Add snapshots upload scripts + +2009-10-26 Holger Weiss + + * tools/git-notify: git-notify: Make the state file group writable + + For shared repositories, the state file used by git-notify should + usually be group writable, so we now set the umask to 0002 by default. + This can be adjusted by setting the "notify.umask" configuration key or + by using the "-U" option on the command line. + + * tools/git-notify: git-notify: Remove an empty subroutine + + The gitweb_url() subroutine was an unused and empty hangover. + +2009-10-25 Holger Weiss + + * tools/git-update-mirror: git-update-mirror: Remove a useless sed(1) + call + + The sed(1) command in question was a hangover which had no effect + anymore. + +2009-10-24 Holger Weiss + + * tools/git-notify: git-notify: Check the exit status of pipes + + Properly check the exit status of all processes we execute and abort on + error. + + * tools/git-notify: git-notify: Handle non-UTF-8 commits + + Make sure that commit messages which use an encoding other than US-ASCII + or UTF-8 are handled correctly. Also, assume that the diff contents use + the same encoding as the commit message. This assumption may well be + wrong, but that's the best we can do. + + * tools/git-notify: git-notify: Don't generate duplicate notifications + + Never notify on a given commit more than once, even if it's referenced + via multiple branch heads. We make sure this won't happen simply by + maintaining a list of commits we notified about. The file path used for + saving this list can be specified using the new "-t" option. (The + contrib/hooks/post-receive-email script distributed with Git tries hard + to avoid such a list, but it doesn't get the necessary magic right.) + + * tools/git-notify: git-nofity: Try to shorten Gitweb URLs + + Instead of using the full SHA1 values of commit object names within + Gitweb URLs, try to abbreviate them to a shorter unique name. + + * tools/git-notify: git-notify: Move the Gitweb URL to the bottom + + In commit notifications, specify the Gitweb URL (if any) at the bottom + of the ASCII "table" which summarizes the commit. That looks better. + + * tools/git-notify: git-notify: Truncate summary after 50 characters + + If the first line of a commit message is longer than 50 characters, + truncate it before adding the resulting string to the subject line of a + notification. This makes sure the subject line won't get too long + (unless the commit author name is unusually long, which we don't check). + The Git User's Manual recommends keeping the first line of a commit + message shorter than that, anyway: + + | Though not required, it's a good idea to begin the commit message with + | a single short (less than 50 character) line summarizing the change, + | followed by a blank line and then a more thorough description. Tools + | that turn commits into email, for example, use the first line on the + | Subject line and the rest of the commit in the body. + + [ http://www.kernel.org/pub/software/scm/git/docs/user-manual.html ] + + * tools/git-notify: git-notify: Send notifications on ref changes, too + + Do not only generate notifications on commits, but also if a branch head + or lightweight tag was created, removed, or modified. Notifications on + branch head updates are omitted if one or more commit notification have + been generated and the branch head now references a descendant of the + originally referenced commit (which should be the usual case). + + * tools/git-notify: git-notify: Call git-rev-list(1) via a subroutine + + Add a subroutine which abstracts away executing git-rev-list(1) and + checking the result in order to avoid code duplication. + + * tools/git-notify: git-notify: Mention the committer where applicable + + If the committer is not the author of the commit, mention the committer + in addition to the author. + + * tools/git-notify: git-notify: New subroutine for column alignment + + Most notifications include an ASCII "table" with two columns. The + formatting of these columns is now handled by the new format_table() + subroutine, so that the alignment can easily be changed in the future. + + * tools/git-notify: git-notify: Ignore "empty" commits + + Omit notifications regarding commits which don't change the tree + whatsoever. + + * tools/git-notify: git-notify: Remove unused tag notification code + + The code which handles notifications regarding tags was unused, as only + objects listed by git-rev-list(1) are considered, and git-rev-list(1) + never spits out the sha1 of a tag object. + + * tools/git-notify: git-notify: Save author without trailing space + + Adjust the regular expression which catches the commit author name so + that it doesn't include the space character which follows that name. + + * tools/git-notify, tools/git-update-mirror: Import git-update-mirror + and git-notify + + Import the (self-written) git-update-mirror script, which updates clones + of Git repositories and then calls git-notify (in just the same way as a + post-receive hook would be called by Git). The git-notify script is + imported from git://source.winehq.org/git/tools.git (commit: 03d66f34) + and generates notifications on repository changes. We'll use these + scripts for generating our commit e-mails. + +2009-10-22 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c, plugins/t/check_snmp.t: Fix usage of + repeated -o options in check_snmp + +2009-10-15 Thomas Guyot-Sionnest + + * plugins-root/check_icmp.c: Set proper network byte order for icmp_id + and icmp_seq in icmp packets + +2009-10-14 Thomas Guyot-Sionnest + + * NEWS, plugins-root/check_icmp.c: Increment per-host sequence in + check_icmp + +2009-09-26 Thomas Guyot-Sionnest + + * tools/sfsnapshotgit: Change default for SFSNAP_DEST + + * tools/sfsnapshotgit: Correcting name and email address + + * tools/sfsnapshotgit: Enhancements to tools/sfsnapshotgit + +2009-09-25 Thomas Guyot-Sionnest + + * configure.in: Using $srcdir is the proper way to go + +2009-09-25 nagiosplugins + + * tools/sfsnapshotgit: Add sfsnapshotgit + + * configure.in, plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Allow custom versions with the release file... + +2009-09-24 Ton Voon + + * NEWS, doc/developer-guidelines.sgml: Updated documentation re: no + equals sign and single quote + + * NEWS: Updated NEWS file with docs changes + +2009-09-23 Thomas Guyot-Sionnest + + * NEWS: Test, again + + * NEWS: Test + +2009-09-21 Thomas Guyot-Sionnest + + * NEWS, THANKS.in: Oops - wrong author/bug in last commit! + + * NEWS, THANKS.in, plugins/check_http.c: Add proxy-authorization option + to check_http (Peter Doherty - #2863772, Bryan Irvine - #2863925) + +2009-09-19 Thomas Guyot-Sionnest + + * NEWS, plugins-scripts/check_ircd.pl: Fix check_ircd binding to wrong + interface (#668778) + + * doc/RELEASING: Update RELEASING document with proper tag creation and + push commands + +2009-09-16 Ton Voon + + * BUGS, ChangeLog, NEWS, NP-VERSION-GEN, configure.in, package.def: Prep + for 1.4.14 release + +2009-09-14 Ton Voon + + * plugins-root/pst3.c: Ensure dirhandle is closed (Duncan Ferguson) + +2009-09-11 Ton Voon + + * plugins/t/check_snmp.t: Fix skip number + +2009-09-05 Thomas Guyot-Sionnest + + * plugins/tests/check_snmp.t: Add a test that succeeds on check_snmp + v1.4.13. Newer versions skip additional + lines so this new test fails on the current head. + + Note: check_snmp v1.4.13 with multi-line strings return somewhat v3 output; + it's not exactly what the specs say but it doesn't appears to break them + either. The fix could eventually supports both v2 and v3 output formats. + +2009-08-05 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix segfault in check_snmp (definitive fix is + still in the works - see bug #2832451) + +2009-07-31 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix check_snmp passing single-quotes as -m + argument when it should be empty + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp: Add some + verbose output and tests + + * plugins/tests/check_snmp.t, plugins/tests/check_snmp_agent.pl, + plugins/tests/conf/snmpd.conf: Add tests using custom snmp agent + + Only multi-line string test for now (regression test), counter rollover + tests planed with my snmp_counters_new branch. + + NB: 64bit counters are broken in NetSNMP::agent from NetSNMP version 5.4.1 + and lower, but might come in handy one day + + * plugins/t/check_snmp.t: Fix check_snmp Timetick test with <1 day + uptime + +2009-07-23 Thomas Guyot-Sionnest + + * doc/RELEASING: Add accidentally removed line plus a note about the web + copy + + * doc/RELEASING: Merge changes from web + +2009-07-17 Ton Voon + + * doc/developer-guidelines.sgml: Updated links for exchange.nagios.org + +2009-07-14 Ton Voon + + * NEWS, THANKS.in, plugins-root/pst3.c: pst3 compile with Sun Studio + Compiler + +2009-06-22 Ton Voon + + * plugins/check_cluster.c: Added example for check_cluster to alert if + more than X non-OK states + +2009-06-16 Matthias Eble + + * NPTest.pm: Switch back to "use Test" and plain prints instead of + diag() + + * NPTest.pm: Tinderbox output testing commit + +2009-06-15 Matthias Eble + + * NPTest.pm, test.pl.in: Make output of "make test" more verbose + + This is intended to make error fixing based on tinderbox output + easier. + +2009-06-14 Matthias Eble + + * plugins-root/check_icmp.c: Fixed error in rtt/rta calculation in case + of system clock problems + + Time differences are now set to 0 in case of backward timejumps so there are no wrap-around problems any more. + The RTA calculation hopefully gets a more accurate value in these cases also. + +2009-06-13 Matthias Eble + + * plugins-scripts/t/check_ifoperstatus.t, + plugins-scripts/t/check_ifstatus.t, plugins/t/check_snmp.t: Fixed + testcases for check_snmp, check_ifstatus and check_ifoperstatus when no + snmp community is specified + + The checks for invalid/unavailable hosts need a complete command line. + They failed on hosts where no community was specified. Now, an invalid community is used so + the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway. + + * plugins-scripts/t/check_ifoperstatus.t, + plugins-scripts/t/check_ifstatus.t: Further test parameters and skip + blocks for check_ifoperstatus.t. getTestparam changes for + check_ifstatus.t and ifoperstatus.t + + Added snmp_interface and snmp_ifxtable test parameters to check_ifoperstatus.t. + Also getTestParameter calls for both plugins were converted to use three arguments + instead of undocumented >3 arg behaviour which led to redundant data in NPTest.cache. + +2009-06-11 Matthias Eble + + * NEWS, plugins-scripts/check_ifoperstatus.pl: renamed + check_ifoperstatus' newly introdced -x to -P so it fits check_ifstatus + + check_ifstatus already used -x so both plugins can use same short option, now. + to specify privacy protocol. + + * NEWS, plugins-scripts/check_ifstatus.pl, + plugins-scripts/t/check_ifstatus.t: Fixed SNMPv3 behaviour of + check_ifstatus. Added -P to define privprotocol (#2343438 - Robin + Schroeder) + + check_ifstatus didn't function correctly with SNMPv3. This is fixed now. + Created argument-hash for SNMP session creation. This removes redundant code. + Session creation was moved out of process_arguments() and now takes place + after setting the timeout handler. + + Additionally the -P argument was added to specify the privprotocol. + + * plugins-scripts/t/check_ifoperstatus.t: Added testcases for + check_ifoperstatus + + Added testcases for check_ifoperstatus. No SNMPv3 testing + included for now. + + * plugins-scripts/check_ifoperstatus.pl: minor fixes to + check_ifoperstatus + + Minor output fixes for check_ifoperstatus. + Fixed typo so that -n now implies -I as documented. + +2009-06-10 Thomas Guyot-Sionnest + + * lib/extra_opts.h, lib/tests/test_opts1.c, lib/tests/test_opts2.c: Use + a more "natural" way of writing argument lists in extra-opts tests. + +2009-06-11 Matthias Eble + + * NEWS, plugins-scripts/check_ifoperstatus.pl: check_ifoperstatus is now + more user friendly in case of missing arguments + + Added proper usage messages in case of missing arguments. + Removed accidently committed Data::Dumper call. + Minor whitespace fixes. + + * plugins-scripts/check_ifoperstatus.pl: Whitespace and indent fixes for + check_ifoperstatus + + * NEWS, plugins-scripts/check_ifoperstatus.pl: Fixed SNMPv3 behaviour of + check_ifoperstatus. Added -x to define privprotocol (#2343438 - Robin + Schroeder) + + check_ifoperstatus didn't function correctly with SNMPv3. This is fixed now. + Created argument-hash for SNMP session creation. This removes redundant code. + Session creation was moved out of process_arguments() and now takes place + after setting the timeout handler. + + Additionally the -x argument was added to specify the privprotocol. + +2009-06-02 Holger Weiss + + * THANKS.in, lib/utils_base.c: Fix the memory allocation for the + thresholds data + + Allocate the appropriate amount of memory for storing the thresholds + data. Before, we allocated the amount of memory required for storing a + _pointer_ to the thresholds data. This crashed (at least) check_mysql + when using its "-S" option on FreeBSD/amd64 (as reported and analyzed by + Nikita Kalabukhov - 2797757). + + * plugins-root/check_icmp.c: Don't use the plain char type for data + buffers + + Buffers which are used for holding arbitrary data should be referenced + using pointers to void and accessed using pointers to unsigned char. + +2009-06-01 Matthias Eble + + * plugins/check_pgsql.c: Whitespace indent fixes for check_pgsql + + * plugins-root/check_icmp.c: Fixed check_icmp compiler warnings by + including float.h + + Self defined DBL_MAX caused compiler warnings. Now float.h + which defines DBL_MAX is included. + + * plugins-root/check_icmp.c: Fixed --help output for warn and critical + thresholds (sf.net #2796624, debian #530553) + + check_icmp wrongly calculated the current thresholds in --help output. + + * plugins/check_pgsql.c: Added verbose output to check_pgsql (#2799281 - + Jun Kuriyama) + + check_pgsql displayed the -v flag in help output, but didn't + accept the verbosity argument. Added -v and basic verbose output. + + * NEWS, plugins/check_fping.c: check_fping now supports passing target + timeout and interval to fping (#2347686 - Martin Foster) + + Added support for passing timeout and interval length to check_fping. + To protect compatibility, both options use fping's defaults if they + are not specified on the command line. + +2009-05-27 Thomas Guyot-Sionnest + + * NEWS, lib/utils_base.h, plugins/check_snmp.c, plugins/t/check_snmp.t: + check_snmp: Make use of standard threshold functions + + This patch makes use of standard threshold functions. This allows using + doubles as thresholds. + + Since SNMP supports only integers, double precision numbers are only + printed when parsed from a STRING type. + + In addition, support for printing properly Timeticks type has been added, + and the code has been thoroughly cleaned. + + * plugins/check_snmp.c: Fix whitespaces in check_snmp + +2009-05-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/Makefile.am, plugins/check_by_ssh.c: Fix + check_by_ssh interpretation of quotes in -C parameter (#1985246, + #2268675) + +2009-05-22 Matthias Eble + + * NEWS, plugins/check_mrtgtraf.c: Fixed wrong perfdata label for output + traffic in check_mrtgtraf + + check_mrtgtraf used the label "in" for both input and output traffic. + This fixed, now. + + * plugins/check_smtp.c: Removed -n option in check_smtp's help and usage + output (#2782784) + + Check_smtp's help showed the -n/--nocommand options to not send an + SMTP command. This usage is covered by check_tcp and is thus not needed + in check_smtp. + +2009-05-20 Thomas Guyot-Sionnest + + * plugins/sslutils.c: Whitespace changes only + + * NEWS, THANKS.in, plugins/check_http.c, plugins/netutils.h, + plugins/sslutils.c: check_http: Add SSL/TLS hostname extension support + (SNI) - (#1939022 - Joe Presbrey) + + * NEWS, THANKS.in, plugins-scripts/subst.in: Fix awk subst.in/subst + script path error (#2722832 - Martin Foster) + + * NEWS, THANKS.in, plugins/check_mysql.c, plugins/check_mysql_query.c: + Fix check_mysql* not using password set in my.cnf (#2531905 - Ben Timby) + +2009-05-20 Holger Weiss + + * gl/Makefile.am, gl/alignof.h, gl/arpa_inet.in.h, gl/c-strtod.c, + gl/c-strtod.h, gl/config.charset, gl/dup-safer.c, gl/fd-safer.c, + gl/fsusage.c, gl/gai_strerror.c, gl/getloadavg.c, gl/getopt1.c, + gl/gettext.h, gl/localcharset.c, gl/m4/00gnulib.m4, gl/m4/btowc.m4, + gl/m4/c-strtod.m4, gl/m4/errno_h.m4, gl/m4/extensions.m4, + gl/m4/fcntl_h.m4, gl/m4/floorf.m4, gl/m4/gnulib-common.m4, + gl/m4/gnulib-comp.m4, gl/m4/include_next.m4, gl/m4/inet_ntop.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/locale-fr.m4, + gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, gl/m4/mbrtowc.m4, + gl/m4/mktime.m4, gl/m4/multiarch.m4, gl/m4/printf.m4, gl/m4/regex.m4, + gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, + gl/m4/sys_socket_h.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/wchar.m4, gl/m4/wcrtomb.m4, gl/math.in.h, gl/mbrtowc.c, + gl/mountlist.c, gl/regex_internal.h, gl/stdint.in.h, gl/stdio.in.h, + gl/stdlib.in.h, gl/strdup.c, gl/strerror.c, gl/sys_socket.in.h, + gl/unistd.in.h, gl/vasnprintf.c, gl/wchar.in.h, gl/xmalloc.c: Sync with + the latest Gnulib code (cb75dc5) + +2009-05-19 Chris Pepper + + * plugins/check_ups.c, plugins/urlize.c: Fix a few minor typos + +2009-05-19 Holger Weiss + + * doc/developer-guidelines.sgml: Talk about Git instead of CVS + + Update the Developer Guidelines to reflect the fact that our development + is done using Git instead of CVS these days (as noted by Chris Pepper on + the "nagiosplug-devel" list). + + While at it, apply another few minor cleanups. + + * doc/developer-guidelines.sgml: Remove comments regarding former + requirements + + Don't explain why Libtool and Gettext are no longer needed. Libtool + actually is a requirement, as (at least) the M4 macros provided by + Libtool are needed for our Autotools setup. And the fact that Gettext + is no longer needed probably isn't that interesting for new developers. + +2009-05-07 Ton Voon + + * NEWS, THANKS.in, plugins/check_disk.c: Fixed typo in check_disk + +2009-05-01 Matthias Eble + + * NEWS, plugins/check_nt.c, plugins/tests/check_nt.t: Fixed crash from + check_nt when -H unspecified or given multiple times (sf.net #2731755, + debian #521097) + +2009-03-24 Thomas Guyot-Sionnest + + * NEWS, plugins/check_nt.c: check_nt: allow returning UNKNOWN on + timeouts (-u) + + * plugins/netutils.c, plugins/netutils.h: Make socket alarm handler + customisable (like c459ca07) + + * NEWS, THANKS.in, plugins/check_mysql.c: check_mysql: Fix segfault with + old slaves (#2696823 - Oskar Ahner) + + * plugins/check_nt.c: Whitespace and intend cleanup + +2009-03-21 Thomas Guyot-Sionnest + + * plugins/check_http.c: Update check_http short help with new stycky and + stickyport options. + + * plugins/check_http.c: check_http: die when an invalid --onredirect + option is specified + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: check_http: + add --onredirect=stickyport - also follow the same port + +2009-03-20 Thomas Guyot-Sionnest + + * .gitignore, gl/Makefile.am, gl/m4/gnulib-cache.m4, + gl/m4/gnulib-comp.m4, gl/m4/mktime.m4, gl/m4/time_h.m4, gl/m4/time_r.m4, + gl/m4/timegm.m4, gl/mktime.c, gl/time.in.h, gl/time_r.c, gl/timegm.c: + Add the timegm Gnulib module + + * NEWS, plugins/negate.c, plugins/t/negate.t: negate: make timeouts + configurable + + * plugins/utils.c, plugins/utils.h: Make alarm handler customisable + + * NEWS, plugins/negate.c: negate: Fix not printing the real timeout in + ALRM handler when timeout is left to default + + * plugins/tests/check_http.t: tests/check_http.t: Add various + timeout-related tests + +2009-03-19 Thomas Guyot-Sionnest thomas@aei.ca + + * NEWS, plugins/check_http.c: Fixed check_http not timing-out on + redirects + +2009-03-18 Thomas Guyot-Sionnest + + * plugins/sslutils.c, plugins/tests/check_http.t: Revert "Add timezone + support and fix checks around cert expiration" (keep the expiration fix) + + This reverts commit d41a33a434558189300113c28b26e2d3d681d390. + + * plugins/t/check_snmp.t: Add suggested multi-oid test (John A. Barbuto) + + * plugins/check_snmp.c: check_snmp: Fix potential buffer overflow - + enforce MAX_OIDS limit (John A. Barbuto) + + * tools/tinderbox_build: Fix logging of STDERR in tinderbox tests phase + +2009-03-17 Thomas Guyot-Sionnest + + * plugins/sslutils.c, plugins/tests/check_http.t: Add timezone support + and fix checks around cert expiration + +2009-03-17 Thomas Guyot-Sionnest + + * plugins/t/check_procs.t: Check for existence of pre-instaleld pst3 for + Solaris tests in t/check_procs.t + +2009-03-17 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: Fix check_http sending HTTP/1.0 with v1.1 + headers (#2638765) + +2009-03-16 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t: Fix check_snmp test on solaris + +2009-03-16 Thomas Guyot-Sionnest + + * plugins/tests/check_http.t: Update extended check_http tests for + 0d78171... + Also add some tests, and make debug mode loop infinitely. + + * plugins/check_http.c: check_http fixes: + - Fix broken printf on 500 errors + - Add bytes to normal output (accidentally removed in 0d78171) + + * plugins/check_snmp.c, plugins/t/check_snmp.t: check_snmp fixes: + - Fix broken compilation caused by typo in command ending + - Remove extra whitespaces at EOL + - Fix invalid host test on Ubuntu Hardy (and possibly others) + +2009-03-14 Ton Voon + + * plugins/check_snmp.c: Ignore stderr messages unless return code is + non-zero or there is no output + + * NEWS, THANKS.in, plugins/Makefile.am, plugins/check_snmp.c, + plugins/t/check_snmp.t: Fixed passing of quotes in OID for check_snmp + (#1985230 - Jan Wagner, patch by John Barbuto) + +2009-03-06 Ton Voon + + * plugins/tests/certs/expired-cert.pem, + plugins/tests/certs/expired-key.pem, plugins/tests/check_http.t: Create + expired cert for testing purposes. Updated tests to check + expired and unexpired certificates + +2009-03-05 Ton Voon + + * plugins/tests/certs/server-cert.pem, + plugins/tests/certs/server-key.pem, plugins/tests/check_http.t: Added + inline tests for HTTPS using HTTP::Daemon::SSL + +2009-02-24 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_snmp.c: check_snmp long help missing + retries entry (#2608223) + + Fix for check_snmp long help, reported by Richard Edward Horner + +2009-02-20 Ton Voon + + * po/fr.po: Updated string ids, due to typo fixes + + * plugins-scripts/check_mailq.pl, plugins/check_dns.c, + plugins/check_http.c, plugins/check_ldap.c, plugins/check_mysql.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_snmp.c, + plugins/check_tcp.c, plugins/check_ups.c: Typo fixes (Jan Wagner - SF + 1878971) + +2009-02-19 Ton Voon + + * NEWS, THANKS.in, plugins/check_nt.c, plugins/tests/check_nt.t: Fixed + coredump from check_nt when drive not found (Olli Hauer - SF 2179754) + +2009-02-06 Thomas Guyot-Sionnest + + * doc/RELEASING: Devel doc: NP-VERSION-GEN needs to be updated as well + + * NEWS: Small correction in NEWS entry + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Update the devel notes + for Git + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Revert "Moving project + administration documents to nagiosplugins.org site" + + This reverts commit f4a52594818e7c3634a397ac1f86ef87a68bd121. + +2009-02-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c: check_http --onredirect=sticky follows + using the same IP address (sf.net #2550208). + +2009-02-03 Thomas Guyot-Sionnest + + * NEWS: Add NEWS entry for last commit + + * plugins/check_http.c: Fix aberrant behaviours in check_http: + + check_http used to ignore many parameters with check combinations - sometimes + even time thresholds(!!) + + With this commit as long as a response is received *all* checks are performed + on it. + + This fixes #1460312 plus a number of other issues I discovered over time. + +2009-01-26 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + plugins/check_ntp_peer.c: Make extract_value more generic: + + Add a separator argument passed using defines. + +2009-01-24 Thomas Guyot-Sionnest + + * lib/tests/test_ini1.c, lib/tests/test_opts1.c: Remove the commented + out blocks + + The die tests are implemented in the test_*3.t files + + * lib/tests/test_ini1.t, lib/tests/test_ini3.t: Fix paths in test_ini + tests + +2009-01-23 Thomas Guyot-Sionnest + + * .gitignore, configure.in, lib/tests/Makefile.am, + lib/tests/test_ini1.c, lib/tests/test_ini1.t, lib/tests/test_ini3.c, + lib/tests/test_ini3.t, lib/tests/test_opts3.t: Add die tests for + parse_ini + +2009-01-22 Thomas Guyot-Sionnest + + * lib/parse_ini.c, lib/tests/test_opts3.t: Return UNKNOWN if none of the + default files can be found. + + It makes no sense to return unknown if an implicit section is not found, but + go on if the file is missing + +2009-01-21 Thomas Guyot-Sionnest + + * .gitignore, configure.in, lib/tests/Makefile.am, + lib/tests/test_opts1.c, lib/tests/test_opts2.c, lib/tests/test_opts3.c, + lib/tests/test_opts3.t: Add die tests for extra-opts + +2009-01-19 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + plugins/check_ntp_peer.c: Move check_ntp's extract_value to + utils_base.c. + + This function can also be used to parse performance data strings which + could be useful in the future. + +2009-01-21 Thomas Guyot-Sionnest + + * .gitignore, lib/tests/test_opts1, lib/tests/test_opts2: Accidentally + included built executables - also updated .gitignore + +2009-01-20 Thomas Guyot-Sionnest + + * configure.in, lib/tests/Makefile.am, lib/tests/test_opts.t, + lib/tests/test_opts1, lib/tests/test_opts1.c, lib/tests/test_opts1.t, + lib/tests/test_opts2, lib/tests/test_opts2.c, lib/tests/test_opts2.t: + Some platform are missing setenv + + Instead of adding the gnulib module for solving tests only I split the test + in two, setting environment from Perl for the later. + + * lib/tests/Makefile.am: Fix (or try at least) for IRIX compile to tap + tests + + Gnulib says: "$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise" + Everywhere else we use LTLIBINTL so I assume the tests should use it as well. + + * plugins/t/check_users.t: Trick for check_users test without users + logged-in + +2009-01-19 Thomas Guyot-Sionnest + + * tools/tinderbox_build: Build extra-opts in tinderbox so they can be + tested + +2009-01-18 Thomas Guyot-Sionnest + + * lib/tests/Makefile.am: Re-apply "Cleanup; fix the way libraries are + linked; Make-It-Simple(tm)" + + This reverts commit 7449b16b1781c645751e2c05b93893e93630fb2a. + + * gl/wchar.in.h: Trying out new patch for IRIX 6.5 from Bruno Haible + + See: http://article.gmane.org/gmane.comp.lib.gnulib.bugs/16341 + + * gl/wchar.in.h: Revert "Trying out a patch for IRIX 11" + + This reverts commit d190c5d25865a7414eea4fe6409a94842fba220e. + +2009-01-16 Thomas Guyot-Sionnest + + * gl/wchar.in.h: Trying out a patch for IRIX 11 + + See: http://lists.gnu.org/archive/html/bug-gnulib/2009-01/msg00098.html + +2009-01-15 Thomas Guyot-Sionnest + + * configure.in: Removing AC_FUNC_ALLOCA from configure.in (added in the + gnulib sync commit) + + I added AC_FUNC_ALLOCA because of a mistake on my part (which has been fixed + before the final commit). Removing it now. + + * lib/tests/test_disk.c: Typo + + * .gitignore, build-aux/config.rpath, configure.in, gl/Makefile.am, + gl/alloca.in.h, gl/arpa_inet.in.h, gl/base64.c, gl/base64.h, gl/btowc.c, + gl/config.charset, gl/errno.in.h, gl/fcntl.in.h, gl/float.in.h, + gl/gai_strerror.c, gl/getaddrinfo.c, gl/getaddrinfo.h, gl/gethostname.c, + gl/getloadavg.c, gl/getopt.c, gl/inet_ntop.c, gl/localcharset.c, + gl/m4/absolute-header.m4, gl/m4/alloca.m4, gl/m4/arpa_inet_h.m4, + gl/m4/btowc.m4, gl/m4/c-strtod.m4, gl/m4/codeset.m4, + gl/m4/double-slash-root.m4, gl/m4/eoverflow.m4, gl/m4/errno_h.m4, + gl/m4/extensions.m4, gl/m4/fcntl_h.m4, gl/m4/fsusage.m4, + gl/m4/getaddrinfo.m4, gl/m4/gethostname.m4, gl/m4/getloadavg.m4, + gl/m4/getopt.m4, gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/hostent.m4, gl/m4/iconv.m4, + gl/m4/include_next.m4, gl/m4/inet_ntop.m4, gl/m4/inline.m4, + gl/m4/intdiv0.m4, gl/m4/intldir.m4, gl/m4/intlmacosx.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/localcharset.m4, + gl/m4/locale-fr.m4, gl/m4/locale-ja.m4, gl/m4/locale-zh.m4, + gl/m4/lock.m4, gl/m4/longlong.m4, gl/m4/ls-mntd-fs.m4, gl/m4/malloc.m4, + gl/m4/math_h.m4, gl/m4/mbrtowc.m4, gl/m4/mbsinit.m4, gl/m4/mbstate_t.m4, + gl/m4/mountlist.m4, gl/m4/multiarch.m4, gl/m4/netdb_h.m4, + gl/m4/netinet_in_h.m4, gl/m4/nls.m4, gl/m4/onceonly.m4, gl/m4/open.m4, + gl/m4/po.m4, gl/m4/printf-posix.m4, gl/m4/printf.m4, gl/m4/progtest.m4, + gl/m4/regex.m4, gl/m4/servent.m4, gl/m4/size_max.m4, gl/m4/snprintf.m4, + gl/m4/sockpfaf.m4, gl/m4/stdbool.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, + gl/m4/string_h.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, + gl/m4/sys_socket_h.m4, gl/m4/threadlib.m4, gl/m4/uintmax_t.m4, + gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, gl/m4/visibility.m4, + gl/m4/vsnprintf.m4, gl/m4/wchar.m4, gl/m4/wchar_t.m4, gl/m4/wcrtomb.m4, + gl/m4/wctype.m4, gl/m4/wint_t.m4, gl/m4/write.m4, gl/m4/xsize.m4, + gl/math.in.h, gl/mbrtowc.c, gl/mbsinit.c, gl/netdb.in.h, + gl/netinet_in.in.h, gl/open-safer.c, gl/open.c, gl/regcomp.c, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/snprintf.c, + gl/stdbool.in.h, gl/stdint.in.h, gl/stdio-write.c, gl/stdio.in.h, + gl/stdlib.in.h, gl/strdup.c, gl/streq.h, gl/strerror.c, gl/string.in.h, + gl/sys_socket.in.h, gl/unistd.in.h, gl/vasnprintf.c, gl/vasprintf.c, + gl/verify.h, gl/vsnprintf.c, gl/wchar.in.h, gl/wcrtomb.c, + gl/wctype.in.h, gl/write.c, gl/xalloc.h, gl/xmalloc.c, gl/xsize.h, + plugins/Makefile.am, plugins/netutils.h: Sync with gnulib + + * tap/tap.h: Clean up last commit - remove the __STDC_VERSION__ check in + tap.h + + HP-UX refuses to compile tap with the check for __STDC_VERSION__ >= 199901L + even though it can. + +2009-01-14 Thomas Guyot-Sionnest + + * tap/tap.h: Trying to see if HP-UX will compile without the + __STDC_VERSION__ check in tap.h + +2009-01-13 Thomas Guyot-Sionnest + + * lib/Makefile.am: Make /lib before /lib/tests to satisfy dependencies + (building tests fails on IRIX) + +2009-01-09 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Fix test from last commit + + * lib/tests/test_utils.c: basename check in test_utils.c was accidentaly + added again. + + In 538b97c I reverted a serie of libtap patch by Ton Voon; it included + the removal of the useless basename check. + + Relevant portion of the changelog from which it was removed (f31cd40): + + Removed basename test as we should use base_name from GNUlib which is + tested separately + + * lib/Makefile.am, lib/tests/Makefile.am: Revert "Cleanup; fix the way + libraries are linked; Make-It-Simple(tm)" + + Trying to see if this has any relation to the tinderbox failure. I doubt it + and will revert back as soon as it's tested. + + This reverts commit a97e5fbda21a05574b0e3c5a5118402ebfbbd13c. + +2009-01-08 Thomas Guyot-Sionnest + + * lib/tests/test_utils.c: Try to make IRIX happy (this fixes a similar + warning in Solaris) + +2009-01-07 Thomas Guyot-Sionnest + + * lib/Makefile.am, lib/tests/Makefile.am: Cleanup; fix the way libraries + are linked; Make-It-Simple(tm) + + lib/Makefile.am | 2 +- + lib/tests/Makefile.am | 37 ++++--------------------------------- + 2 files changed, 5 insertions(+), 34 deletions(-) + +2009-01-06 Thomas Guyot-Sionnest + + * tools/git2svn.pl: git2svn: Use --add-author-from with "git set-tree" + + * tools/tinderbox_build: tinderbox_build: Add --enable-libtap configure + option + + * tools/tinderbox_build: tinderbox_build: Clarify comment + +2008-12-23 Ton Voon + + * plugins/check_snmp.c: Allow privproto to be passed through check_snmp + to snmpget. Defaults to DES + for compatibility + +2008-12-03 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_mrtg.c: check_mrtg: fix plugin + returning UNKNOWN instead of OK (bug #2378068) + +2008-12-02 Ton Voon + + * tools/sfsnapshot: Updated to latest due to SF policy changes + +2008-11-28 Thomas Guyot-Sionnest + + * .gitignore, Makefile.am, NEWS, configure.in, lib/tests/Makefile.am, + tap/Makefile.am, tap/README, tap/tap.3, tap/tap.c, tap/tap.h, + tap/tests/Makefile.am, tap/tests/README, tap/tests/diag/Makefile.am, + tap/tests/diag/test.c, tap/tests/diag/test.pl, tap/tests/diag/test.t, + tap/tests/fail/Makefile.am, tap/tests/fail/test.c, + tap/tests/fail/test.pl, tap/tests/fail/test.t, tap/tests/ok/Makefile.am, + tap/tests/ok/ok-hash/Makefile.am, tap/tests/ok/ok-hash/test.c, + tap/tests/ok/ok-hash/test.pl, tap/tests/ok/ok-hash/test.t, + tap/tests/ok/ok-numeric/Makefile.am, tap/tests/ok/ok-numeric/test.c, + tap/tests/ok/ok-numeric/test.pl, tap/tests/ok/ok-numeric/test.t, + tap/tests/ok/ok/Makefile.am, tap/tests/ok/ok/test.c, + tap/tests/ok/ok/test.pl, tap/tests/ok/ok/test.t, + tap/tests/pass/Makefile.am, tap/tests/pass/test.c, + tap/tests/pass/test.pl, tap/tests/pass/test.t, + tap/tests/plan/Makefile.am, tap/tests/plan/no-tests/Makefile.am, + tap/tests/plan/no-tests/test.c, tap/tests/plan/no-tests/test.pl, + tap/tests/plan/no-tests/test.t, tap/tests/plan/no_plan/Makefile.am, + tap/tests/plan/no_plan/test.c, tap/tests/plan/no_plan/test.pl, + tap/tests/plan/no_plan/test.t, + tap/tests/plan/not-enough-tests/Makefile.am, + tap/tests/plan/not-enough-tests/test.c, + tap/tests/plan/not-enough-tests/test.pl, + tap/tests/plan/not-enough-tests/test.t, tap/tests/plan/sane/Makefile.am, + tap/tests/plan/sane/test.c, tap/tests/plan/sane/test.pl, + tap/tests/plan/sane/test.t, tap/tests/plan/skip_all/Makefile.am, + tap/tests/plan/skip_all/test.c, tap/tests/plan/skip_all/test.pl, + tap/tests/plan/skip_all/test.t, + tap/tests/plan/too-many-plans/Makefile.am, + tap/tests/plan/too-many-plans/test.c, + tap/tests/plan/too-many-plans/test.pl, + tap/tests/plan/too-many-plans/test.t, + tap/tests/plan/too-many-tests/Makefile.am, + tap/tests/plan/too-many-tests/test.c, + tap/tests/plan/too-many-tests/test.pl, + tap/tests/plan/too-many-tests/test.t, tap/tests/skip/Makefile.am, + tap/tests/skip/test.c, tap/tests/skip/test.pl, tap/tests/skip/test.t, + tap/tests/todo/Makefile.am, tap/tests/todo/test.c, + tap/tests/todo/test.pl, tap/tests/todo/test.t: Add Libtap as a bundled + library (does not change any behaviour without --enable-libtap) + + Detects system library as pre-1.4.13 and does not install the built-in library anymore + + Tested on: + - Linux x86_64, with and without local libtap (System libtap installed) + - Linux x86, with and without local libtap (System libtap NOT installed) + - Solaris SPARC, with and without local libtap, with and without system libtap installed + + * Makefile.am, configure.in, external/README, + external/tap-1.01-nagios-plugins.tar.gz, lib/tests/Makefile.am, + lib/tests/test_all.t, lib/tests/test_base64.t, lib/tests/test_cmd.t, + lib/tests/test_disk.t, lib/tests/test_ini.t, lib/tests/test_opts.t, + lib/tests/test_tcp.t, lib/tests/test_utils.c, lib/tests/test_utils.t, + tools/setup: Revert inclusion of libtap into nagiosplugins + (except for the NEWS file) + + This reverts the following commits (latest first): f3e0909, 9f16b54, be8df51, f31cd40, 5270c7d, a25083f, f1bfe40, c503d85 and 6c476db + +2008-11-27 Thomas Guyot-Sionnest + + * tools/tinderbox_build: tinderbox: Don't alter SunOS path if we're + building off a repository tree + + SunOS make will work only out of snapshots and releases. + +2008-11-26 Thomas Guyot-Sionnest + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Fixing build breakages (I totally forgot this rule + was there...) + + * NP-VERSION-GEN: Fix it for good now + + * NP-VERSION-GEN: Minor fix in NP-VERSION-GEN + + * Makefile.am, NP-VERSION-GEN, configure.in, plugins-root/Makefile.am, + plugins-scripts/Makefile.am, plugins/Makefile.am: Disable dynamic + versionning for releases, and allow generating version out of + subversion. + + This should be a definitive fix for systems with non-compilant make programs as the version will be taken from $(PACKAGE_VERSION) instead. + + At the same time I added code for generating svn-based version strings. + +2008-11-25 Thomas Guyot-Sionnest + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Workaround to support more make programs + + Avoid the use of "-include". Since "include" is interpreted by Automake, we have to use a special macro instead. + + * plugins-scripts/Makefile.am: Exporting ENV vars from Makefile is + supported only with GNU Make. Use the shell instead. + +2008-11-24 Thomas Guyot-Sionnest + + * tools/distclean: No need to bailout on distclean failures + + * tools/tinderbox_build: Revert "tinderbox: Comment out additional PATH + conponent added for SunOS builds" + + This reverts commit 088452683cf881c6ed717cc559ca2eee3faa95ca. + +2008-11-23 Thomas Guyot-Sionnest + + * tools/tinderbox_build: tinderbox: Comment out additional PATH + conponent added for SunOS builds + + * plugins-root/Makefile.am, plugins-scripts/Makefile.am, + plugins/Makefile.am: Avoid the use of .PHONY (target s created twice and + I have no idea if it's right). + +2008-11-23 Thomas Guyot-Sionnest + + * .gitignore: Update .gitignore to include missing file/extention + + * .gitignore: Add .gitignore (Imported from svn:ignore) + +2008-11-23 Thomas Guyot-Sionnest + + * BRANCHES, Makefile.am, NP-VERSION-GEN, NPTest.pm, acinclude.m4, + autogen.sh, command.cfg.in, configure.in, contrib/check_adptraid.sh, + contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_arping.pl, contrib/check_email_loop.pl, + contrib/check_fan_cpq_present, contrib/check_fan_fsc_present, + contrib/check_frontpage, contrib/check_http-with-client-certificate.c, + contrib/check_hw.sh, contrib/check_ica_master_browser.pl, + contrib/check_ica_metaframe_pub_apps.pl, + contrib/check_ica_program_neigbourhood.pl, + contrib/check_inodes-freebsd.pl, contrib/check_javaproc.pl, + contrib/check_joy.sh, contrib/check_log2.pl, contrib/check_lotus.pl, + contrib/check_mem.pl, contrib/check_ms_spooler.pl, + contrib/check_ora_table_space.pl, contrib/check_oracle_instance.pl, + contrib/check_oracle_tbs, contrib/check_pfstate, contrib/check_rbl.c, + contrib/check_smb.sh, contrib/check_snmp_disk_monitor.pl, + contrib/check_snmp_printer.pl, contrib/check_snmp_process_monitor.pl, + contrib/check_snmp_procs.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc, contrib/check_traceroute.pl, + contrib/check_uptime.c, contrib/check_vcs.pl, contrib/check_wins.pl, + contrib/packet_utils.pm, contrib/utils.py, doc/BRANCHING, + doc/developer-guidelines.sgml, lib/extra_opts.c, lib/parse_ini.c, + lib/tests/test_base64.c, lib/tests/test_cmd.c, lib/tests/test_disk.c, + lib/tests/test_ini.c, lib/tests/test_opts.c, lib/tests/test_tcp.c, + lib/tests/test_utils.c, lib/utils_base.c, lib/utils_cmd.c, + lib/utils_disk.c, lib/utils_tcp.c, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/t/check_icmp.t, plugins-scripts/Makefile.am, + plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_file_age.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_log.sh, plugins-scripts/check_mailq.pl, + plugins-scripts/check_mssql.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in, + plugins-scripts/t/check_file_age.t, plugins-scripts/t/check_rpc.t, + plugins-scripts/t/utils.t, plugins-scripts/utils.pm.in, + plugins/Makefile.am, plugins/check_apt.c, plugins/check_by_ssh.c, + plugins/check_cluster.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/negate.c, plugins/netutils.c, + plugins/netutils.h, plugins/popen.c, plugins/popen.h, plugins/runcmd.c, + plugins/runcmd.h, plugins/sslutils.c, plugins/t/check_by_ssh.t, + plugins/t/check_cluster.t, plugins/t/check_dig.t, + plugins/t/check_disk.t, plugins/t/check_dns.t, plugins/t/check_dummy.t, + plugins/t/check_fping.t, plugins/t/check_ftp.t, plugins/t/check_hpjd.t, + plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_jabber.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, plugins/t/check_mysql_query.t, + plugins/t/check_nagios.t, plugins/t/check_ntp.t, plugins/t/check_ping.t, + plugins/t/check_pop.t, plugins/t/check_procs.t, plugins/t/check_smtp.t, + plugins/t/check_snmp.t, plugins/t/check_swap.t, plugins/t/check_tcp.t, + plugins/t/check_time.t, plugins/t/check_udp.t, plugins/t/check_users.t, + plugins/t/negate.t, plugins/urlize.c, plugins/utils.c, plugins/utils.h, + test.pl.in, tools/README, tools/git2svn.pl, tools/mini_epn.c, + tools/setup, tools/tinderbox_build: Removing CVS/SVN tags and replacing + with git-based versioning + For contrib/, full tags have been imported from subversion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2091 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-20 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Add comment to recent check_disk patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2088 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-19 Thomas Guyot-Sionnest + + * lib/parse_ini.c, lib/utils_base.c, lib/utils_disk.c, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c, plugins/check_apt.c, plugins/check_cluster.c, + plugins/check_disk.c, plugins/check_dns.c, plugins/check_dummy.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/check_nwstat.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_radius.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_ups.c, + plugins/netutils.c, plugins/popen.c, plugins/urlize.c: Bulk EOL cleanup + + $ git diff --ignore-space-change|diffstat + 0 files changed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2087 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_peer.c: Fixed buffer + overflow in check_ntp/check_ntp_peer (#1999319, Ubuntu #291265) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2086 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, lib/utils_disk.c, plugins/check_disk.c: check_disk: + rerpopulate the mount list after doing a stat() on paths specified with + -p for better automount support. + + NB: There's a memory leak here - properly freeing the mount list would invlove + much more work - there's many other places where leaks can happen so it + should be a project on its own. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2085 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-14 Ton Voon + + * tools/sfupload: Helper script to upload tarballs to SF and create + md5sum + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2081 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-11 Ton Voon + + * doc/developer-guidelines.sgml: Updated tinderbox link + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2080 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-08 Thomas Guyot-Sionnest + + * NEWS, plugins/check_nt.c: Add missing long options for check_nt (for + use with extra-opts) + + Extra-opts (ini files) requires long-options for setting up arguments. Added + the missing ones for check_nt so that it can be properly used with extra-opts. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2079 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_ide_smart.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql_query.c, + plugins/check_nt.c: Fix long options parsing in check_disk, check_dns, + check_mrtg and check_mrtgtraf (check_tcp was done in an earlier commit) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2078 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-08 Ton Voon + + * THANKS.in: Added Jan for check_http method patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2077 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_http.c, plugins/tests/check_http.t: + Fixed bug where extra headers and redirect caused segfault (Dieter Van + de Walle - 2089159) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2076 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_http.c, plugins/tests/check_http.t: check_http now + has options to specify the HTTP method (Jan - 2155152) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2075 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Fix for tar on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2074 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-07 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins-root/check_icmp.c: check_icmp now reports min + and max round trip time perfdata (Steve Rader) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2073 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_tcp.c: Fix check_tcp longoptions handling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2072 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Ton Voon + + * lib/tests/Makefile.am: Need to add in the libgnu.la for Solaris and + other platforms + where missing functions have been replaced by GNUlib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2071 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * NEWS: Missing NEWS item + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2070 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/tests/test_opts.c: Fix calculation of extra-opts + parameters. + + By reading the current list instead of the additional one when counting parameters, extra-opts calculation was allocating insuficient space for the final array if later sections contained more arguments than the sum of all previously parsed sections. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2069 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Ton Voon + + * Makefile.am, NEWS, configure.in: Fixed libtap dependency issue. + Warning: will install tap into lib directories + if ./configure --enable-libtap is used, but as development tool, will be okay + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2068 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-05 Thomas Guyot-Sionnest + + * plugins/t/check_http.t: Fix check_http test (altinity.com redirects + now). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2067 f882894a-f735-0410-b71e-b25c423dba1c + +2008-11-04 Thomas Guyot-Sionnest + + * lib/tests/test_ini.c, lib/tests/test_opts.c: Fixed the test (not the + bug yet) and added similar one to test_ini (that one works) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2066 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_opts.c: Corrected test_opts plan + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2065 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/plugins.ini, lib/tests/test_opts.c: Adding extra-opts check + that crash on my prod servers (*** glibc detected *** malloc(): memory + corruption: 0x0804e248 ***) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2064 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/parse_ini.c, lib/tests/plugin.ini: Make extra-opts (C + plugins) behave more like N::P: + + N::P allows both '#' and ';' for comments. Extra-opts used to allow only '#', it now allows both (';' is the standard for ini files) + Extra-opts does not allow trailing comments anymore (like N::P) + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2063 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_ups.c: check_ups now sends a LOGOUT + string (debian bug #387001) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2062 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-22 Matthias Eble + + * BUGS, NEWS, plugins-scripts/check_ifoperstatus.pl: check_ifoperstatus + -n flag now works as expected (sf.net #1569488) + check_ifoperstatus now supports ifType based lookup for ifIndex + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2061 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-21 Ton Voon + + * NEWS, tools/tinderbox_build: Updated tinderbox server + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2060 f882894a-f735-0410-b71e-b25c423dba1c + +2008-10-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_users.c: check-users thresholds was >= rather than + > as documented. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2059 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-25 Ton Voon + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.13 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2057 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/check_http.t: Fix small test failure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2056 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Moving project + administration documents to nagiosplugins.org site + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2055 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Thomas Guyot-Sionnest + + * plugins/check_ntp_peer.c: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2054 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Holger Weiss + + * THANKS.in, plugins/check_http.c: Some HTTP server + applications/configurations cause trouble if the port is + explicitly specified in our "Host:" header line. Therefore, we now specify the + port only if we're using a non-default port (Erik Wasser - 2082501). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2053 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-02 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c: Fix possible segfault in + check_ntp_peer with deliberately invalid packets + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2052 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-01 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c, plugins/check_ntp_time.c: + check_ntp_peer/check_ntp_time used to show port in --help but ignored + the argument - now implemented. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2051 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_http.c: Revert "Re-structure the HTTP + 1.1 headers to prevent 301s on servers with virtual hosts" + + This reverts commit 2030 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2050 f882894a-f735-0410-b71e-b25c423dba1c + +2008-09-01 Holger Weiss + + * plugins/check_http.c: Under some circumstances, the 'url' path of a + redirection target missed + a leading slash. While this was fixed later on, the incomplete 'url' + was used for redirection loop detection and error messages. This is now + fixed by adding the missing slash immediately. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2049 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-25 Ton Voon + + * plugins/tests/check_http.t: Fix HTTP::Daemon::VERSION to get a fixed + header size for tests + (Sven Nierlein) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2048 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/check_http.t: Updated with more tests re: multiple + status codes (Sven Nierlein) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2047 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-25 Holger Weiss + + * NEWS, THANKS.in, plugins/check_http.c, plugins/tests/check_http.t: The + "-e" option now accepts a comma-delimited list of expected status + lines (Sven Nierlein - 1894496). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2046 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-22 Ton Voon + + * plugins/tests/check_http.t, plugins/tests/var/root: Added HTTP tests + for status codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2045 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-21 Ton Voon + + * configure.in: Only include extra-opts tests if libtap is enabled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2044 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Note re: --enable-libtap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2043 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am, lib/tests/test_all.t, lib/tests/test_base64.t, + lib/tests/test_cmd.t, lib/tests/test_disk.t, lib/tests/test_ini.t, + lib/tests/test_opts.t, lib/tests/test_tcp.t, lib/tests/test_utils.c, + lib/tests/test_utils.t: Correctly link to included libtap. Simplify + invoking test scripts. + Removed basename test as we should use base_name from GNUlib which is + tested separately + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2042 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/tinderbox_build: Fix regexp of version number of snapshot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2041 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Remove .svn files in distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2040 f882894a-f735-0410-b71e-b25c423dba1c + + * external/tap-1.01-nagios-plugins.tar.gz, tools/setup: Renamed altered + tap file to nagios-plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2039 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-21 Thomas Guyot-Sionnest + + * plugins/check_ntp_peer.c: Nothing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2038 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c: Misplaced comment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2037 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c: Complete rewrite of the extract_value + function + + The original one was flawed (easy to trigger segfaults) and did not allow some whitespaces as permitted by rfc1305. This one has been troughfully tested with tap (the testing code might get included later) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2036 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h, lib/tests/test_opts.c: Typos in + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2035 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-16 Thomas Guyot-Sionnest + + * plugins/check_mysql.c, plugins/check_mysql_query.c: Fix assignment + written as a comparison in validate_arguments() when db_pass is NULL + (Patch from http://blog.barfoo.org/projects/rpms-for-sles10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2034 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: Fix check_fping --help output (Patch from + http://blog.barfoo.org/projects/rpms-for-sles10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2033 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_by_ssh.t: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2032 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-08 Ton Voon + + * plugins-root/pst3.c: Close on fd + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2031 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-08 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_http.c: Re-structure the HTTP 1.1 + headers to prevent 301s on servers with virtual hosts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2030 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Typo in --help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2029 f882894a-f735-0410-b71e-b25c423dba1c + +2008-08-05 Thomas Guyot-Sionnest + + * tools/devmode: Set -D_FORTIFY_SOURCE=2, and added a comment with link + to explaination of this flag. + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2028 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-28 Matthias Eble + + * plugins-root/check_icmp.c: -b option now specifies ICMP data bytes + instead of packet size + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2027 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-17 Matthias Eble + + * NEWS, plugins-root/check_icmp.c: Add support for packet size + modification (-b) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2026 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-10 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Verbose should not have to exceed 3 as per + developement guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2025 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: Add -D_FORTIFY_SOURCE + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2024 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ups.c: Typo in check_ups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2023 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-09 Matthias Eble + + * plugins/t/check_snmp.t: rewrote check_snmp.t to use Test::More + added perfdata checking for string values + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2022 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_snmp.c: check_snmp now only prints perfdata for + non numeric values (Joerg Linge #1867716) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2021 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-08 Ton Voon + + * Makefile.am, tools/tinderbox_build: Removed libtap configuration for + the moment, as tinderbox builds + are breaking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2020 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/utils_cmd.c, lib/utils_cmd.h, plugins/Makefile.am, + plugins/check_procs.c: check_procs captures stderr and adds to plugin + output. This is + from a merge of branch nagiosplug/branches/new_threshold_syntax 1979:1982 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2019 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-06 Holger Weiss + + * plugins-root/check_dhcp.c: Don't try to set the "SO_BROADCAST" socket + option for unicast requests. + (Also, removed the unused "DHCP_UNICAST_FLAG" macro.) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2018 f882894a-f735-0410-b71e-b25c423dba1c + +2008-07-02 Ton Voon + + * lib/tests/Makefile.am: Use tap.h from the libtap directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2017 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am, plugins-root/pst3.c: Change pst3 again, this + time to remove use of kvm which is not + available in Solaris 10 non-global zones. Uses /proc, which is not + available in older versions of Solaris. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2016 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-30 Ton Voon + + * tools/setup: Fixed bug in tools/setup if docbook was run + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2015 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Have to list tap_dir manually to get into make dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2014 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-26 Ton Voon + + * Makefile.am, configure.in, external/README, + external/tap-1.01-altinity.tar.gz, lib/tests/Makefile.am, tools/setup, + tools/tinderbox_build: Adding libtap into distribution to help run C + based tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2013 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-17 Ton Voon + + * plugins-root/pst3.c: Fixed possible coredump. Removed one level of + subroutines (Duncan Ferguson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2012 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-09 Matthias Eble + + * NEWS, plugins/check_dig.c, plugins/t/check_dig.t: Added testcases for + check_dig + check_dig's -l option is mandatory now (#1986306) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2011 f882894a-f735-0410-b71e-b25c423dba1c + +2008-06-02 Ton Voon + + * NEWS, plugins-root/pst3.c: Optimised pst3 for systems with large + number of processes (Duncan Ferguson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2010 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, perlmods/Nagios-Plugin-0.22.tar.gz, + perlmods/Nagios-Plugin-0.27.tar.gz: Updated Nagios::Plugin perl modules + to 0.27 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2009 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-30 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_http.c: Fix Debian bug #460097: + check_http --max-age broken (Hilko Bengen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2008 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-29 Thomas Guyot-Sionnest + + * BUGS: typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2007 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-27 Ton Voon + + * doc/RELEASING: Changed SF file release to use sftp instead of ftp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2006 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.12 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2004 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, configure.in: Not picking up solaris systems correctly for + check_dhcp. Only + affected SunStudio compiles of check_dhcp (1890260 - Rob Windsor) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2003 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: Addition to help to state that -f will always + return OK if ssh command + is executed (Alain Dewit - 1852198) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2002 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/pst3.c: Add additional PID column heading + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2001 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-26 Thomas Guyot-Sionnest + + * NEWS: correct typo in NEWS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2000 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-23 Thomas Guyot-Sionnest + + * REQUIREMENTS: Add a note about radiusclient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1999 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-22 Thomas Guyot-Sionnest + + * NEWS, configure.in: Fix linking against OpenSSL where libdl is + required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1998 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-21 Thomas Guyot-Sionnest + + * NEWS, plugins/check_by_ssh.c, plugins/t/check_by_ssh.t: Fixed passive + option in check_by_ssh + Also: + - On non-skipped stderr, check_by_ssh now returns UNKNOWN or worse (result from command) instead of always UNKNOWN. + - Fixed passive tests and make is always run the specified number of tests (using fail if there's nothing to test). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1997 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-20 Thomas Guyot-Sionnest + + * plugins/t/check_by_ssh.t: Oops - forgot to remove the SKIP block + (which didn't seem to work fine) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1996 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_by_ssh.t: Add check_by_ssh tests (passive checks are + broken - should be fixed before next release!) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1995 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_radius.c: Clobber password in check_radius process + list aguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1994 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-13 Thomas Guyot-Sionnest + + * plugins/check_dns.c: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1992 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-07 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/utils.h: Added support for --extra-opts in all C plugins + (disabled by default, see configure --help) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1991 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_ping.c: Added performance data to + check_ping (Christian Schneemann) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1990 f882894a-f735-0410-b71e-b25c423dba1c + +2008-05-02 Thomas Guyot-Sionnest + + * NEWS, plugins/negate.c: negate now has the ability to replace the + status text as well (-s, --substitute) + Also changed: + - default timeout to 11 instead of 9 (since it's recommended to have a higher timeout, and many plugins default to 10 seconds) + - If there's no STDOUT lines returned, still returns the returned result if it's NON-ok instead of forcing it to UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1989 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-30 Thomas Guyot-Sionnest + + * NEWS, plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/t/check_mysql.t: Add socket support to check_mysql* + Also clears the password from check_mysql command-line options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1988 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-29 Holger Weiss + + * configure.in: Support "--without-pgsql" (reported by Alex Songe via + IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1987 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-29 Thomas Guyot-Sionnest + + * plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c: Use UT_THRESHOLDS_NOTES in all plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1986 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c: --help output + cleanup (plus removal of spaces on blank lines) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1985 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-27 Thomas Guyot-Sionnest + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_snmp.c, plugins/check_swap.c, plugins/check_ups.c, + plugins/utils.h: --help output cleanup (plus removal of spaces on blank + lines) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1984 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-23 Thomas Guyot-Sionnest + + * plugins/check_radius.c: Correct typo and make the --help notes a bit + simpler. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1983 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-17 Thomas Guyot-Sionnest + + * plugins/check_dns.c: Correct the help text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1979 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_dns.c: Allow to repeat -a to set multiple possible + addresses + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1978 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_peer.c: check_ntp and + check_ntp_peer now show proper jitter/stratum thresholds longopts in + --help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1977 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-04 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/parse_ini.c, lib/tests/test_ini.c, + lib/tests/test_opts.c: make parse_ini die like in N::P if section isn't + found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1976 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-02 Thomas Guyot-Sionnest + + * lib/Makefile.config-opts, lib/tests/Makefile.config-opts: Delete + obsolete files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1974 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, lib/parse_ini.c, lib/tests/Makefile.am, + lib/tests/test_ini.t, lib/tests/test_opts.t, po/de.po, po/fr.po, + po/nagios-plugins.pot: - Add --enable-extra-opts configure option for + compiling extra-opts support + - Auto-update po/pot files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1973 f882894a-f735-0410-b71e-b25c423dba1c + +2008-04-01 Thomas Guyot-Sionnest + + * lib/parse_ini.c: fix the obvious... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1972 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/extra_opts.h: np_extra_opts now retain pointers + from argv so that plugins can still overwrite sensitive options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1971 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-31 Thomas Guyot-Sionnest + + * commit d043862c154070b2c58172289899dd14776e2d03, Author: Thomas + Guyot-Sionnest , Date: 2008-03-31: update + svn:ignore property (last gnulib update added many auto-generated files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1970 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/extra_opts.c, lib/extra_opts.h, lib/parse_ini.c, lib/parse_ini.h, + lib/tests/test_ini.c, lib/tests/test_opts.c: Fix for last commit - I + accidentaly broke my local Makefile and tests weren't being re-compiled. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1968 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-30 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/extra_opts.h, lib/tests/test_opts.c: - Remove + the last argument of np_extra_opts + - Code cleanups and comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1967 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-29 Thomas Guyot-Sionnest + + * commit af71e9fc0ef268b322c4f4677773273c07926a7a, Author: Thomas + Guyot-Sionnest , Date: 2008-03-26: Update + svn:ignore property + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1966 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-24 Thomas Guyot-Sionnest + + * lib/extra_opts.c, lib/extra_opts.h, lib/tests/config-opts.ini, + lib/tests/test_opts.c, lib/tests/test_opts.t: Add extra-opts argument + parsing with tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1961 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h: Replace broken usage of + NAGIOS_CONFIG_PATH with a stub function (that will try to find a config + file in the future...) + Allow NULL locator (default file/section) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1960 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-20 Thomas Guyot-Sionnest + + * plugins/check_dig.c: - Fix bug #1920671 + - Make --help output looks nice + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1959 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-18 Ton Voon + + * plugins/tests/check_procs.t: Include test for check_procs, using input + file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1955 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c, plugins/tests/var/ps-axwo.darwin, + plugins/tests/var/ps_axwo.debian: Updated check_procs with a hidden + --input-file option. + Include some sample outputs for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1954 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-17 Ton Voon + + * plugins/t/check_nagios.t: Don't run check_nagios tests on Solaris, + because of pst3 requirement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1953 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-16 Thomas Guyot-Sionnest + + * lib/tests/config-dos.ini, lib/tests/plugin.ini, lib/tests/test_ini.c: + Add tests: + - DOS-newline ini file + - section defined twice + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1951 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-15 Thomas Guyot-Sionnest + + * lib/parse_ini.c: parse_ini now reads the default section if the + request one can't be found. + All tests should return ok now. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1950 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: Oops - this line shouldn't have been here (doesn't + even work anyways) ;) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1949 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/tests/plugin.ini, lib/tests/test_ini.c: - Make + equal-less parameters illegal + - parameters without argument after '=' are now assumed to be argument-less + - Add a testcase for space in stanza and various argument-less parameters + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1948 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: Fix handling of leading and trailing spaces in stanza + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1947 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/tests/test_ini.c: Fix segfault in test_ini.c and + uncomment the affected tests + Fix bug in stanza parsing where full section could be skipped + Fix single-argument options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1946 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/parse_ini.h, lib/tests/test_ini.c, + lib/tests/test_ini.t: This commit consist of two changes: + 1. Make np_get_defaults return a linked list instead of a string. It will then be easy to convert the linked list back to an argument array. + 2. Fix tests 3-4 of test_ini.c. + + A test_ini.t was added too. parse_ini and test_ini aren't included yet in the build makefiles. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1945 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-15 Matthias Eble + + * plugins/check_http.c: Add port to Host Header to prevent problems with + non default ports (Christophe Dupre #1881898) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1944 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Matthias Eble + + * NEWS, plugins/check_dig.c: Added -A/--dig-arguments to check_dig + (#1889453/#1874041) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1943 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Enhanced check_smtp to actually print invalid + response text (#1911239) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1942 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Ton Voon + + * NEWS, plugins-root/Makefile.am, plugins/Makefile.am: Fixed 64 bit pst3 + when tries to link to gettext. Gettext linked + dynamically, if necessary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1941 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-14 Thomas Guyot-Sionnest + + * gl/charset.alias, gl/configmake.h, gl/math.h, gl/ref-add.sed, + gl/ref-del.sed, gl/stdio.h, gl/stdlib.h, gl/string.h, gl/unistd.h: These + files are generated automatically during the make process, and removed + by make clean. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1940 f882894a-f735-0410-b71e-b25c423dba1c + +2008-03-11 Ton Voon + + * configure.in, gl/m4/mbstate_t.m4: Possible fix for HP-UX compile + problems of regex_internal.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1939 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/utils_base.c, plugins-root/Makefile.am, + plugins/check_http.c, plugins/check_smtp.c, plugins/common.h: Fixed link + -m64 problems on pst3 for solaris. Fixed _FILE_OFFSET_BITS + redefinition warnings. Fixed helper ar error in ./configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1938 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-28 Ton Voon + + * NEWS, configure.in, plugins-root/Makefile.am, plugins-root/pst3.c, + plugins/check_procs.c, plugins/t/check_procs.t: Reverted check_procs for + solaris back to using pst3 due to truncation + for argument fields using other methods + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1937 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/build_perl_modules: Fix where PERL5LIB is blank + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1936 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-18 Ton Voon + + * NEWS: Added CVE MITRE tracking number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1935 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-13 Matthias Eble + + * NEWS, plugins/check_pgsql.c: check_pgsql now builds with postgres lib + v8.3 (Jan Wagner #1878972) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1934 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix --local argument handling (Jan Wagner + #1878971) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1933 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-13 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Fix broken intending (The whole file use spaces + only except my last patch and 1-3 other places). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1932 f882894a-f735-0410-b71e-b25c423dba1c + + * commit fe2e5f4aecab99a1c361994e4b678d6709d65f6c, Author: Thomas + Guyot-Sionnest , Date: 2008-02-13: Add + two files to svn:ignore + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1931 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: News, nothing else. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1929 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: This floorf workaround is Nnot needed anymore since + floorf is part of Gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1928 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_base64.c: Reverting patch to test 8-bit data: Still + broken on Solaris (7-bit works as before) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1927 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-12 Thomas Guyot-Sionnest + + * gl/Makefile.am, gl/base64.c, gl/base64.h, gl/charset.alias, + gl/configmake.h, gl/floor.c, gl/floorf.c, gl/m4/base64.m4, + gl/m4/floorf.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-comp.m4, + gl/m4/math_h.m4, gl/math.h, gl/math.in.h, gl/ref-add.sed, + gl/ref-del.sed, gl/stdio.h, gl/stdlib.h, gl/string.h, gl/unistd.h, + lib/Makefile.am, lib/base64.c, lib/base64.h, lib/tests/Makefile.am, + lib/tests/test_base64.c, plugins/check_http.c, plugins/check_smtp.c: + Import Gnulib floorf and base64 and removed our old base64 library. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1926 f882894a-f735-0410-b71e-b25c423dba1c + + * build-aux/config.rpath, build-aux/link-warning.h, gl/Makefile.am, + gl/alloca.c, gl/alloca.in.h, gl/asnprintf.c, gl/asprintf.c, + gl/basename.c, gl/c-strtod.c, gl/cloexec.c, gl/config.charset, + gl/creat-safer.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/error.c, gl/error.h, gl/exit.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fd-safer.c, gl/float+.h, + gl/float.in.h, gl/fsusage.c, gl/fsusage.h, gl/full-read.c, + gl/full-read.h, gl/full-write.c, gl/full-write.h, gl/gai_strerror.c, + gl/getaddrinfo.c, gl/getaddrinfo.h, gl/gethostname.c, gl/getloadavg.c, + gl/getopt.c, gl/getopt.in.h, gl/getopt1.c, gl/getopt_int.h, + gl/gettext.h, gl/inet_ntop.c, gl/inet_ntop.h, gl/intprops.h, + gl/localcharset.c, gl/localcharset.h, gl/m4/absolute-header.m4, + gl/m4/alloca.m4, gl/m4/extensions.m4, gl/m4/float_h.m4, + gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, gl/m4/getloadavg.m4, + gl/m4/gettext.m4, gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, + gl/m4/gnulib-comp.m4, gl/m4/iconv.m4, gl/m4/include_next.m4, + gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intlmacosx.m4, gl/m4/intmax_t.m4, + gl/m4/lib-link.m4, gl/m4/localcharset.m4, gl/m4/lock.m4, + gl/m4/longdouble.m4, gl/m4/longlong.m4, gl/m4/malloc.m4, + gl/m4/mbchar.m4, gl/m4/mbiter.m4, gl/m4/mbrtowc.m4, gl/m4/memchr.m4, + gl/m4/minmax.m4, gl/m4/netinet_in_h.m4, gl/m4/po.m4, + gl/m4/printf-posix.m4, gl/m4/regex.m4, gl/m4/snprintf.m4, + gl/m4/socklen.m4, gl/m4/stdint.m4, gl/m4/stdio_h.m4, gl/m4/stdlib_h.m4, + gl/m4/strcase.m4, gl/m4/strdup.m4, gl/m4/strerror.m4, gl/m4/string_h.m4, + gl/m4/strndup.m4, gl/m4/strnlen.m4, gl/m4/sys_socket_h.m4, + gl/m4/uintmax_t.m4, gl/m4/ulonglong.m4, gl/m4/unistd_h.m4, + gl/m4/vasnprintf.m4, gl/m4/vasprintf.m4, gl/m4/vsnprintf.m4, + gl/m4/wchar.m4, gl/m4/wctype.m4, gl/m4/wcwidth.m4, gl/m4/wint_t.m4, + gl/malloc.c, gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, + gl/minmax.h, gl/mountlist.c, gl/mountlist.h, gl/netinet_in.in.h, + gl/open-safer.c, gl/pipe-safer.c, gl/printf-args.c, gl/printf-args.h, + gl/printf-parse.c, gl/printf-parse.h, gl/ref-add.sin, gl/ref-del.sin, + gl/regcomp.c, gl/regex.c, gl/regex.h, gl/regex_internal.c, + gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, gl/safe-read.h, + gl/safe-write.c, gl/safe-write.h, gl/size_max.h, gl/snprintf.c, + gl/snprintf.h, gl/stdbool.in.h, gl/stdint.in.h, gl/stdio.in.h, + gl/stdlib.in.h, gl/strcase.h, gl/strcasecmp.c, gl/strdup.c, gl/strdup.h, + gl/strerror.c, gl/string.in.h, gl/stripslash.c, gl/strncasecmp.c, + gl/strndup.c, gl/strndup.h, gl/strnlen.c, gl/strnlen.h, gl/strnlen1.c, + gl/sys_socket.in.h, gl/unistd--.h, gl/unistd-safer.h, gl/unistd.in.h, + gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, gl/vasprintf.c, + gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, gl/wchar.in.h, + gl/wctype.in.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, + gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, + plugins/common.h, po/Makevars: Sync to latest Gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1925 f882894a-f735-0410-b71e-b25c423dba1c + +2008-02-11 Ton Voon + + * REQUIREMENTS: Hints re: SSL features + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1924 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Added link to FAQ for redhat spopen problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1923 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-31 Thomas Guyot-Sionnest + + * plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins-root/pst3.c: Bump plugins-root/ to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1920 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h, plugins/netutils.h, plugins/popen.h, + plugins/runcmd.h: Bump plugins/ to GPLv3 (header files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1919 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c, plugins/netutils.c, plugins/popen.c, + plugins/runcmd.c, plugins/sslutils.c, plugins/urlize.c, plugins/utils.c: + Bump plugins/ to GPLv3 (non-plugind files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1918 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_ups.c, plugins/check_users.c: Bump plugin/ to GPLv3 + (check_overcr to check_users) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1917 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-30 Thomas Guyot-Sionnest + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_cluster.c, + plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_ntp_peer.c, plugins/check_ntp_time.c, + plugins/check_nwstat.c: Bump plugins/ to GPLv3 (check_apt to + check_nwstat) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1916 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_tcp.c: details... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1915 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_base64.c, lib/tests/test_cmd.c, lib/tests/test_disk.c, + lib/tests/test_ini.c, lib/tests/test_tcp.c, lib/tests/test_utils.c: Bump + lib/tests to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1914 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c, lib/utils_base.c, lib/utils_cmd.c, lib/utils_disk.c, + lib/utils_tcp.c: Bump /lib to GPLv3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1913 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/parse_ini.c: new standardized GPLv3 header (will be applied to all + C files) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1912 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-29 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp_peer.c: check_ntp_peer now checks for the + LI_ALARM flag + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1911 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1910 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_time.c: Fix bugs and + flaws in best offset server selection of check_ntp_time and (deprecated) + check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1909 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ntp_peer.c, plugins/check_ntp_time.c: + Fix help text of check_ntp_* (Bug #1880095) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1908 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-15 Thomas Guyot-Sionnest + + * NEWS, plugins/check_disk.c: Fix check_disk disk usage calculation when + using --group=NAME (related to bug #1348746) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1907 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in: Add AC_SYS_LARGEFILE to configure.in (check_disk + should now work with large file systems (2TB+) on all archs that + supports it) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1906 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-10 Thomas Guyot-Sionnest + + * lib/tests/test_cmd.c: Add a return-code check (also test cmd_run + without out/err buffers) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1905 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-09 Thomas Guyot-Sionnest + + * tools/tinderbox_build: make test-debug generate lots of false errors + in tinderbox. Turning off until we find a solution (so al least we can + watch the tinderbox for breakages again) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1904 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Matthias Eble + + * plugins/check_dns.c: Fixed reverse lookup damaged by previous commit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1903 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Ton Voon + + * plugins/t/check_dns.t: Changed default test values for check_dns + (using nagios.com) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1902 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ftp.t, plugins/t/check_imap.t, + plugins/t/check_jabber.t, plugins/t/check_pop.t, plugins/t/check_tcp.t: + Reverted commits 1898 and 1899 due to reversion of 1879 + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1901 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_tcp.c: Reverted commit 1879 where an invalid + hostname returns UNKNOWN - back to CRITICAL + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1900 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Thomas Guyot-Sionnest + + * plugins/t/check_imap.t, plugins/t/check_jabber.t, + plugins/t/check_pop.t: more r1879 fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1899 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ftp.t, plugins/t/check_tcp.t: Fix test breakages for + commit r1879: check_tcp now returns UNKNOWN with an invalid hostname on + command line + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1898 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-08 Holger Weiss + + * plugins-root/check_icmp.c: Hide some debug output which was printed + even without "-v" (under + certain circumstances). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1897 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fix the handling of ICMP packets which are + not echo replies (such as + destination unreachable messages) or which are not directed at us. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1896 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Get rid of a cast which increases the + required alignment. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1895 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Mark some constant strings "const". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1894 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-07 Holger Weiss + + * plugins/netutils.c: Support "[IPv6]" address syntax. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1893 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: My assumption that "-H example.com:80" didn't + work (see my previous + commit) was wrong, it worked if used together with "-I". So, here's + support for "-H [IPv6]:port", "-H [IPv6]", "-H IPv6", "-H IPv4:port", + "-H IPv4", and "-H host:port". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1892 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Holger Weiss + + * plugins/check_http.c: Remove support for specifying the port number + using "-H example.com:80". + Since this didn't work anyway (because ":80" wasn't stripped from the + "host_name" after extracting the "server_port"), nobody can be using + this syntax, and it prevents "-H" from accepting IPv6 addresses + (neufeind - 1865082). IMO, fixing it to recognize both ":80" and IPv6 + addresses isn't worth it, as the ":80" syntax doesn't seem very useful + for Nagios plugins (given the way how they are usually called in Nagios + command definitions). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1891 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Thomas Guyot-Sionnest + + * lib/tests/test_base64.c: Fix base64 test (known string wasn't + null-terminated) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1890 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_cmd.c: Fix tinderbox breakage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1889 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-06 Matthias Eble + + * plugins/check_ldap.c: If unspecified set LDAP_OPT_SUCCESS to + LDAP_SUCCESS (Sergei Haramundanis - #1498923) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1888 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-05 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c, plugins/check_ntp_time.c: Fix Bug #1862300: + check_ntp_time segfault in 1.4.11 (Also apply to check_ntp) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1887 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-05 Matthias Eble + + * NEWS, THANKS.in, plugins/check_dns.c: check_dns now sorts addresses + for -a support with multiple address replies (Matthias Urlichs #1724052) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1886 f882894a-f735-0410-b71e-b25c423dba1c + +2008-01-04 Matthias Eble + + * plugins/check_procs.c: Cleaned check_procs usage output (Ferenc Wagner + #1862218) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1885 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-21 Holger Weiss + + * plugins-root/check_icmp.c: Fix INADDR_NONE value (for systems which + don't define it). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1884 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Include (if available) to + get SIOCGIFADDR defined on + Solaris. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1883 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins-root/check_icmp.c: New "-s" option to specify + the source IP address (thanks to Harald Jenny + for providing the patch and to Patrick Cervicek for looking into it!) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1882 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-21 Thomas Guyot-Sionnest + + * plugins/check_ldap.c: Remove c formating from translated strings + (makes translation easier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1881 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-19 Holger Weiss + + * plugins/check_ldap.c: Fix the "--help" output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1880 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-19 Ton Voon + + * NEWS, plugins/check_tcp.c: check_tcp now returns UNKNOWN with an + invalid hostname on command line + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1879 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-17 Ton Voon + + * NEWS, THANKS.in, plugins/check_nt.c: Add check_nt -v INSTANCES + (Alessandro Ren) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1877 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-13 Ton Voon + + * plugins/check_nwstat.c: Fixed help output (Christian Mies) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1876 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: NEWS edited for consistent grammar + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1875 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Preparation for + 1.4.11 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1873 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins-root/Makefile.am: Fixed VPATH problem in + plugins-root (Tom Payerle - 1789000) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1872 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, perlmods/Nagios-Plugin-0.21.tar.gz, + perlmods/Nagios-Plugin-0.22.tar.gz: Update to latest Nagios::Plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1871 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-12 Thomas Guyot-Sionnest + + * commit 151531173bd50d66548effa50ef7393a8c680513, Author: Ton Voon + , Date: 2007-12-12: Add build + files/binaries to the svn:ignore propt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1867 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Thomas Guyot-Sionnest + + * plugins/t/check_ntp.t: D'oh! single escape will be handled by Perl.... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1865 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, plugins/t/check_ntp.t: - Fix check_ntp_peer + returning misleading information when an ICMP message came back + - Try to fix some servers apparently exanding the ~ in threshold ranges in t/check_ntp.t + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1864 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Ton Voon + + * lib/tests/test_cmd.c: Fixed test so works on MacOSX (use /bin/sh + instead of /bin/grep). + Added extra test for missing command - should drop into STATE_UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1863 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am: Add verbose flag so each test result is seen, + rather than grouped by test + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1862 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-11 Thomas Guyot-Sionnest + + * plugins-root/check_icmp.c, plugins/check_cluster.c, + plugins/check_http.c, plugins/check_mrtgtraf.c, plugins/check_ntp.c, + plugins/check_ntp_peer.c, plugins/check_ntp_time.c: Adding missing + function calls needed for i18n (only for plugins already in POTFILES.in) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1861 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-10 Thomas Guyot-Sionnest + + * po/fr.po: Some corrections + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1860 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c, plugins/check_mysql.c, + plugins/check_radius.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/negate.c, po/de.po, po/fr.po, po/nagios-plugins.pot: Plenty of + french translations (and a few fixes BTW) + - No more fuzzy french translations + - Only (!) 355 strings to translate + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1859 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c: OOPS! Last commit should have included these + files. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1858 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: D'autres translations - + Err, I mean more translations :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1857 f882894a-f735-0410-b71e-b25c423dba1c + + * po/fr.po: More translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1856 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: re-update the po files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1855 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, po/fr.po: Some translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1854 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-10 Matthias Eble + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Localization updates for + recent changes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1853 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fix output when response time is critical. + Thanks to Nobuhiro Ban (patch #1817228) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1852 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_load.c, plugins/t/check_load.t: Fixed check_load + argument handling when passing non triplet thresholds. Thanks to + Jonathan Kamens (bug #1831890) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1851 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-09 Thomas Guyot-Sionnest + + * po/POTFILES.in, po/de.po, po/fr.po, po/nagios-plugins.pot: Gettin' + ready for some translation frenzy :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1850 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: update po files and fix a + few French translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1849 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-08 Thomas Guyot-Sionnest + + * NEWS, plugins/check_disk.c: Fix check_disk reporting OK if disk usage + grows over 100% (bug #1348746). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1848 f882894a-f735-0410-b71e-b25c423dba1c + +2007-12-04 Thomas Guyot-Sionnest + + * plugins/check_ntp_time.c: Interesting... For some reason it did not + take this (patch barfed on it and I thought I had fixed it already)... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1847 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/Makefile.am, plugins/check_ntp_peer.c, + plugins/check_ntp_time.c, plugins/t/check_ntp.t: Merge changes from + branches/dermoth_ntp_rework (check_ntp_peer/check_ntp_time) + + NEWS | 13 + plugins/Makefile.am | 8 + plugins/check_ntp_peer.c | 628 ++++++++++++++++------------------------------- + plugins/check_ntp_time.c | 323 ++---------------------- + plugins/t/check_ntp.t | 92 +++++- + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1846 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp_peer.c, plugins/check_ntp_time.c: Add the new checks + as check_ntp copies to keep full plug-in history + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1843 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: missing word in comment block. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1838 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: - Use max_state_alt in check_ntp to fix + some issues with the latest commits. + - Roll back the stratum check as there were issues with it and a better one is already implemented in check_ntp_peer (about to be included) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1830 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: Add a max_state_alt function that + put UNKNOWN and DEPENDENT ahead of OK. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1829 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-11 Thomas Guyot-Sionnest + + * NEWS, plugins/check_cluster.c, plugins/check_snmp.c: Fix broken usage2 + in check_snmp and check_cluster + Fix check_cluster blocking some special characters for thresholds ("-", "@", "~") + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1827 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-10 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix newly added stratum check (has to be + decreased by one when using normal NTP packets versus control packets) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1822 f882894a-f735-0410-b71e-b25c423dba1c + +2007-11-09 Thomas Guyot-Sionnest + + * lib/tests/test_base64.c: Adding svn:keywords props + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1819 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/tests/Makefile.am, lib/tests/test_base64.c, + lib/tests/test_base64.t, tools/distclean: Adding test for base64 lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1818 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/base64.c, lib/base64.h, plugins/check_http.c, + plugins/check_smtp.c: Moved base64 function to /lib. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1817 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_tcp.h: Nothing to see here... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1816 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: Credits of check_snmp fix for bug #1815362 (CVE-2007-5623) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1815 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Fix check_snmp buffer overflow (CVE-2007-5623) + + This patch comes from the Gentoo Portage tree but I couldn't find the author. I sent an email and will give credits when I get an answer. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1814 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c: Close the socket on all exits (not just the OK + one) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1813 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Fix missing \n in --help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1812 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-25 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: check_ntp now return UNKNOWN instead of + WARNING if jitter is + unavailable. If no offset threshold is specified and + the offset is unavailable, will return UNKNOWN as well. + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1811 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-25 Ton Voon + + * plugins-root/check_dhcp.c, plugins/check_ping.c, plugins/check_ups.c, + tools/sync_website: Automatically update website with --help output. + Cosmetic + fixes for some help output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1810 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-24 Holger Weiss + + * THANKS.in, plugins/check_snmp.c: Hide the SNMP community string (and + v3 passwords) from error messages + (Bernhard Fischer on nagiosplug-devel@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1809 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-15 Ton Voon + + * doc/RELEASING: Add reparagraph option to make ChangeLog output bit + prettier + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1808 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-14 Holger Weiss + + * plugins/check_http.c: Fix a possible segfault if using "-f follow" and + the server sends a + forged "LLLLocation" header prefixed with multiple "L"s (fabiodds - + 1813346) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1807 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-11 Thomas Guyot-Sionnest + + * NEWS, plugins/check_ntp.c: Add stratum thresholds support for + check_ntp (feature request #1703823) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1806 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Use provided threshold functions (no functionnal + change apart the check for overlaping thresholds) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1805 f882894a-f735-0410-b71e-b25c423dba1c + +2007-10-02 Holger Weiss + + * NEWS, plugins/check_http.c: Fix regression in 1.4.10 where following + redirects to relative URLs on + virtual hosts failed if both "-H" and "-I" were specified (noted by + Rodrigo A. G. Schichaschwili on nagiosplug-devel@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1804 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-29 Ton Voon + + * doc/RELEASING: Updated notes on releasing, mainly for svn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1803 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: Prep for 1.4.10 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1801 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-26 Holger Weiss + + * NEWS, plugins/check_radius.c: Drop the weird and undocumented + behaviour of using positional argument + parsing instead of getopt(3) if 8 command line arguments were given (as + suggested by Matthias) and check whether all required arguments have + been specified in order to spit out proper error messages and to avoid a + possible segfault (as suggested by Thomas). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1800 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-26 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins/check_ntp.c: Patch #1798774: check_ntp: honor + ntp flags + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1799 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-24 Ton Voon + + * perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Nagios-Plugin-0.21.tar.gz: Update N::P with new version, + redirecting help, version and usage to + stdout + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1798 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: State that stderr should not have any + output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1796 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-24 Holger Weiss + + * NEWS, configure.in, plugins/netutils.c: Let ./configure --without-ipv6 + suppress non-IPv4 DNS lookups (noted by + Mark Frost on nagios-users@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1794 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-23 Matthias Eble + + * plugins/check_disk.c, plugins/negate.c: Removed some c99 style + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1793 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_by_ssh.c: Added multiline output capability to + check_by_ssh. Thanks to Matthias Flacke (#1769653) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1792 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: removed solved issues + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1791 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Added radiusclient-ng support to requirement notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1790 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c: Fixed bug: stat was called on remote fs + even if -l was given + Added -L option to call stat on remote fs but without threshold comparison + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1789 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, configure.in, plugins/check_radius.c: Added + radiusclient-ng support for check_radius. Thanks to Sebastien Guay + (#1218438) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1788 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-22 Matthias Eble + + * lib/utils_disk.c, lib/utils_tcp.c, plugins/check_disk.c: substituted + bool/true/false with int/TRUE/FALSE (discussed on np-devel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1787 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/tests/test_disk.c, lib/utils_disk.c, lib/utils_disk.h, + plugins/check_disk.c, plugins/t/check_disk.t: Added -i/-I to ignore + pathes/partitions based on regular expressions + Added check_disk -A selecting all filesystems + -E option must now be passed before -p or -r/-R + Passing -E after -p or -r results in UNKNOWN state + Fixed bug when mixing case sensitive and insensitive regexes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1786 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-22 Thomas Guyot-Sionnest + + * NEWS, plugins/negate.c, plugins/t/negate.t: Rewrite the "map changes + to return codes" patch nearly from scratch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1785 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-21 Ton Voon + + * NEWS, configure.in, lib/Makefile.am, lib/tests/Makefile.am, + lib/tests/test_cmd.c, lib/tests/test_cmd.t, lib/utils_cmd.c, + lib/utils_cmd.h, plugins/Makefile.am, plugins/negate.c, + plugins/t/negate.pl, plugins/t/negate.t: Stop double expansion of + parameters for negate - works like + time command now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1784 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-21 Thomas Guyot-Sionnest + + * plugins/check_disk.c: My solaris box needs %llu to display 64bits + integers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1783 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: - Added some variables at verbose==3 + - Removed support for verbose<0 (-q). -q was broken and tried to to the same as -e. + - -q in now an undocumented alias of -e (for backward-compatibility). + NB: Long help text for -d was already missing. + - Reordered the switches so that: +   a. less-important ones are in alphabetical order + b. short and long help orders match. + - Enclosed "-p | -x" inside braces instead of brackets as one or the other is required. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1782 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-17 Ton Voon + + * Makefile.am: Include directories and files required for perl modules + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1781 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-15 Holger Weiss + + * NEWS, plugins/check_smtp.c: Properly handle SMTP server responses + which are split into multiple + packets (noted by Chris Adams on nagiosplug-help@). TODO: The new + recvline()/recvlines() functions should buffer received data instead of + reading one byte at a time and they should be moved to netutils.c so + that other plugins can use them, too. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1780 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins-root/check_icmp.c: Correct all instances of misaligned + memory access. This fixes bus erros + on platforms which require alignment (such as SPARC and MIPS). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1779 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: Remove "-Wtraditional" from our development GCC flags. + We use ANSI C. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1778 f882894a-f735-0410-b71e-b25c423dba1c + +2007-09-13 Ton Voon + + * Makefile.am, configure.in, perlmods/Class-Accessor-0.31.tar.gz, + perlmods/Config-Tiny-2.10.tar.gz, perlmods/Makefile.am, + perlmods/Math-Calc-Units-1.06.tar.gz, + perlmods/Nagios-Plugin-0.20.tar.gz, + perlmods/Params-Validate-0.88.tar.gz, perlmods/Test-Simple-0.70.tar.gz, + perlmods/install_order, tools/build_perl_modules: Adding in optional + Nagios::Plugin perl module (and + dependencies) compilation and installation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1777 f882894a-f735-0410-b71e-b25c423dba1c + +2007-08-28 Thomas Guyot-Sionnest + + * contrib/check_apc_ups.pl, contrib/check_appletalk.pl, + contrib/check_linux_raid.pl, contrib/check_snmp_procs.pl: These plugins + assumed the "use lib util.pm;" would be substituted like standard Perl + plugins (in plugins-scripts) which isn't the case in contrib. I changed + the "use lib" line to use the default path. People using custom paths + will have to change it manually. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1771 f882894a-f735-0410-b71e-b25c423dba1c + +2007-08-09 Holger Weiss + + * plugins/check_disk.c: Don't use C++ style comments (noted by Johannes + Kingma on + nagiosplug-help@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1770 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-31 Holger Weiss + + * plugins/check_smtp.c: Read the response to an SMTP QUIT command before + closing the socket + (noted by Dieter Hendricks on nagiosplug-help@) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1769 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-29 Holger Weiss + + * lib/utils_base.c: Don't use C++ style comments. + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1768 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-27 Holger Weiss + + * tools/tinderbox_build: If the TMPDIR environment variable is set, use + that instead of "/tmp" as + the installation directory. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1767 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-26 Holger Weiss + + * NEWS, plugins-root/check_dhcp.c: The "--serverip" and "--requestedip" + options now accept host names, too. + This doesn't quite fit the option names and so far I haven't changed the + "--help" output which currently only talks about IP addresses. However, + I don't see why resolving host names should not be supported. + + Also note that for the moment, I added a quick'n'dirty resolve_host() + function which should really go into netutils.c. I just wanted to think + about its interface a bit more before providing such a function globally. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1766 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins-root/check_dhcp.c: New "-m, --mac" option which allows + for specifying the MAC address to + use in the DHCP request. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1765 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: Make sure strncpy(3)d buffers are + nul-terminated. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1764 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: A few minor fixes/improvements which were + included with (but unrelated + to) the "--unicast" patch (Andreas Ericsson and Heiti Ernits - 1218235) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1763 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, configure.in, plugins-root/check_dhcp.c: New "-u, + --unicast" option which gives check_dhcp the ability to mimic a + DHCP relay server in order to check remote subnets (Heiti Ernits and + Andreas Ericsson - 1218235) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1762 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-24 Ton Voon + + * .cvsignore, build-aux/.cvsignore, doc/.cvsignore, gl/.cvsignore, + intl/.cvsignore, lib/.cvsignore, lib/tests/.cvsignore, m4/.cvsignore, + pkg/solaris/.cvsignore, plugins-root/.cvsignore, + plugins-scripts/.cvsignore, plugins/.cvsignore, plugins/t/.cvsignore, + po/.cvsignore: Removing all .cvsignore files + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1761 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot, tools/sfwebcron: Updated to use svn instead of cvs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1760 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-21 Holger Weiss + + * NEWS, plugins/check_http.c: Add "Connection: close" to the HTTP + request header, which tells HTTP/1.1 + servers to close the connection after completion of the response. This + should be compatible with HTTP/1.0, as HTTP/1.0 allows for custom header + fields which should be ignored if not recognized by the server. With + some server configurations, the server would keep the connection alive + without this header line (despite the plugin requesting HTTP/1.0), + resulting in the plugin running into either the server's or it's own + timeout (reported by Roman Schliessmeyer and Jesse Morgan via IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1759 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-15 Matthias Eble + + * THANKS.in, plugins/check_procs.c: Make ps column count in zombie + detection less restrictive. Thanks to Andrew Elwell (#1280470) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1758 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-14 Matthias Eble + + * THANKS.in, plugins/check_smtp.c: Fixed segfault in argument + processing. Thanks to Christoph Schell (#1742066) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1757 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_ntp.c: check_ntp: Fixed typo in typo in + argument sanity check. Thanks to Aurelien Bompard (#1753506) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1756 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-10 Matthias Eble + + * NEWS, plugins/check_disk.c: Added examples for new features to + check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1755 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_disk.c, plugins/t/check_disk.t: Check_disk now + calls stat() for all filesystems to check. + Check_disk prints an strerror() message if the call of stat() fails. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1754 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-07 Matthias Eble + + * plugins/check_ldap.c: Added -v/--verbose argument to call + ldap_perror() for detailed messages on failure. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1753 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: Changed output order of print_revision + print_revision now uses clean_revstring + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1752 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: Changed print_revision output order in + utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1751 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl: substituted $ID$ through $Revision$ + in print_revision call + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1750 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh, plugins-scripts/check_oracle.sh, + plugins-scripts/utils.sh.in: Changed order in -V/--version output + Fixed -V output for check_log and check_oracle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1749 f882894a-f735-0410-b71e-b25c423dba1c + +2007-07-06 Matthias Eble + + * doc/developer-guidelines.sgml: Added hint to avoid using the boolean + type in C as discussed on the devel list + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1748 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-20 Matthias Eble + + * plugins/check_ldap.c: Fixed default behaviour of check_ldaps + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1747 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_ldap.c: Clarified check_ldaps behaviour. New + arguments to explicitly select secure connect behaviour + (--starttls/--ssl). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1746 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: added -V/--version to check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1745 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-18 Matthias Eble + + * REQUIREMENTS, configure.in, plugins/.cvsignore: Make Linux specific + plugin check_ide_smart build if appropriate headers are found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1744 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-17 Holger Weiss + + * plugins/check_http.c: Minor fixes. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1743 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/check_http.c: Fix buffer overflow vulnerabilities when + parsing HTTP redirect + 'Location:' strings using sscanf(3) (Nobuhiro Ban - 1687867) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1742 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-15 Holger Weiss + + * plugins/check_http.c: When following redirects, the plugin supported + 'Location:' header fields + which spanned multiple lines. However, it was not checked whether extra + lines are preceeded with white space, which could lead to the following + header field name being interpreted as the value of the 'Location:' + field if the latter was empty for some reason. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1741 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: `host_name' is a NULL pointer if the "-I" flag + is used instead of "-H", + so use `server_address' instead. Fixes a possible segfault when + following redirects to relative URLs (reported by Ingo Lantschner). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1740 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-13 Matthias Eble + + * plugins/check_ide_smart.c: Fixed some syntax errors to make + check_ide_smart build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1739 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-12 Holger Weiss + + * plugins/check_by_ssh.c: Add "-v" to help/usage output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1738 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-12 Matthias Eble + + * plugins/popen.c: Removed debug line + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1737 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-11 Matthias Eble + + * THANKS.in, plugins/popen.c: Fixed problem with popen.c not parsing + --longopt='foo bar' correctly (Daniel Bimschas #1291987) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1736 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-04 Ton Voon + + * THANKS.in: Removed duplicate names + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1735 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: For 1.4.9 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1733 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-03 Matthias Eble + + * lib/tests/test_tcp.c: Minor corrections to test_tcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1732 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/Makefile.am: Makefile.am changes for test_tcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1731 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/tests/.cvsignore, lib/tests/test_tcp.c, + lib/tests/test_tcp.t: Added test cases for utils_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1730 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, lib/Makefile.am, lib/utils_tcp.c, lib/utils_tcp.h, + plugins/check_tcp.c: Moved check_tcp's expect string testing into + utils_tcp for testing purposes. + Added -A/--all flag to test for every expect string passed. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1729 f882894a-f735-0410-b71e-b25c423dba1c + +2007-06-01 Holger Weiss + + * BUGS, NEWS: Fix possible check_http segfaults when following HTTP + redirects. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1728 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fix an off-by-one error where a realloc(3) call + doesn't allocate space + for nul-termination (Aravind Gottipati - 1729692) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1727 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Call the SSL library initialization functions only + once (not for every + SSL connection). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1726 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Save an entire CPU cycle if c points to NULL + already. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1725 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/sslutils.c: Set the pointers to the SSL and SSL_CTX objects + back to NULL after + freeing them in np_net_ssl_cleanup(). This fixes a check_http segfault + if an SSL site redirects to a non-SSL one (reported by Aravind Gottipati + via IRC). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1724 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-29 Matthias Eble + + * plugins/check_tcp.c: Fix segfault when -e is specified multiple times. + Thanks to John Rouillard and Ralph Roessner (#1475899) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1723 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: No more warn/crit values in performance data if + -w and -c are not specified. + Thanks to Simon Bellwood (#1181554) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1722 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-29 Thomas Guyot-Sionnest + + * NEWS, plugins/check_snmp.c: check_snmp don't warn anymore if something + is printed on stderr + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1721 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: change a bunch of whitespaces (no code was + harmed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1720 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-27 Matthias Eble + + * THANKS.in, plugins-scripts/check_oracle.sh: check_oracle does not need + a valid ORACLE_HOME if called with --db. Thanks to Jason Martin + (#1505551) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1719 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-27 M. Sean Finney + + * lib/utils_base.c, lib/utils_base.h, plugins-root/check_dhcp.c, + plugins-root/check_icmp.c: added functions to utils_base: + np_check_if_root() - returns nonzero if geteuid()==0 + np_warn_if_not_root() - uses the above to print an informative warning + added uses of these functions to check_dhcp and check_icmp. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1718 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-24 Ton Voon + + * plugins/t/negate.pl: Test for new functionality in negate (not + automatically run in make test) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1717 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dummy.c, plugins/t/check_dummy.t: Tests for check_dummy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1716 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-23 Thomas Guyot-Sionnest + + * NEWS, plugins/check_http.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + Update many strings in check_http to get more consistent output + Update translation files; fix all check_http changes in French and most changes in German. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1715 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-18 Thomas Guyot-Sionnest + + * plugins/t/check_tcp.t: Make check_tcp.t compatible with picky web + servers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1714 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-13 Holger Weiss + + * plugins/check_http.c: Add missing options to the usage output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1713 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-13 Matthias Eble + + * THANKS.in, plugins-root/check_dhcp.c: check_dhcp now adds mandatory + end option (Thanks to Enrico Scholz - #1675306) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1712 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-12 Matthias Eble + + * plugins/check_cluster.c: Fixed glibc error caused in utils_base.c due + to uninitialized thresholds struct (spotted on ubundu 6.06 LTS). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1711 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-12 Ton Voon + + * ABOUT-NLS, build-aux/mkinstalldirs, configure.in: Updating gettext + files from coreutils-6.9. mkinstalldirs needs to be in + build-aux for some systems without gettext natively. Also have at top level, + though gettext documentation says file not neceesary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1710 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-09 Matthias Eble + + * plugins/check_ups.c: small typo in --help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1709 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_ups.c: Fixed --help output (Ask Bjoern Hansen + - #1714823) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1708 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: added testcase to verify that old positional + arguments only select one path + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1707 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-03 Matthias Eble + + * ChangeLog, THANKS.in, plugins/check_disk.c: fixed backward + incompatibility introduced in 1.4.8 where all partitions are selected, + if path is specified as last argument (without using -p). + Thanks to Emil Michles (Emilis) on #nagios + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1706 f882894a-f735-0410-b71e-b25c423dba1c + +2007-05-02 Thomas Guyot-Sionnest + + * tools/distclean: Making Solaris happy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1705 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: /* Nothing */ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1704 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_time.c: Fix check_time returning wrong + OK when time is before the epoch on some arch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1703 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-28 Matthias Eble + + * plugins/t/check_cluster.t: added test cases for check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1702 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-25 Ton Voon + + * tools/tinderbox_build: Test installs into temporary directories + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1701 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, plugins/check_load.c, plugins/common.h, + plugins/t/check_load.t: check_load can optionally divide by number of + cpus + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1700 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-23 Holger Weiss + + * plugins/check_ping.c: #ifdef can only test a single macro, not an + expression. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1699 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-20 Holger Weiss + + * plugins-root/check_dhcp.c: Remove unused variables. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1698 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Include "utils_base.h". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1697 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_base.h: Declare print_thresholds(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1696 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Predeclare functions and remove unused + variables. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1695 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-root/check_dhcp.c: Use the 'server identifier' + option instead of the 'siaddr' field as the + DHCP server address; see RFC 2131, 2. (Denis Knauf - 1667488) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1694 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-19 Thomas Guyot-Sionnest + + * NEWS, configure.in: Fix compilation of check_ldap, check_radius and + check_pgsql (*ding*) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1693 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-18 Holger Weiss + + * NEWS, plugins/check_by_ssh.c: Revert my previous change to "-S/--skip" + in favour of the two options + "-E/--skip-stderr" and "-S/--skip-stdout". Both of them support + omitting the number of lines to skip, in which case all output on the + respective file descriptor is skipped. "--skip" is kept as an alias for + "--skip-stdout" for backwards compatibility with recent releases. + + Also, print a message if no (non-skipped) stdout/stderr output is + available. This fixes a segfault if the remote command prints no + output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1692 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-15 Thomas Guyot-Sionnest + + * plugins/check_cluster.c: Localization and help fixes (Thanks Benoit + M.) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1691 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_cluster.c: Cosmetic change + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1690 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster2.README: More details about the changes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1689 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, plugins/Makefile.am, plugins/check_cluster.c: Add thresholds + support for check_cluster + lots of standardization. + Add forgotten items to NEWS. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1688 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, plugins/check_snmp.c: Fix bug #1344584: Counter64 values not + handled correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1687 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-14 Thomas Guyot-Sionnest + + * BUGS: Works for me + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1686 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-14 Holger Weiss + + * BUGS, plugins/check_by_ssh.c: Up to revision 1.35, the "-S" option + skipped the specified number of + lines written to stderr. With revision 1.36 and newer, "-S" skipped the + specified number of lines written to stdout. Now, "-S" skips the + specified number of lines written to stderr; and if the number specified + via "-S" minus the number of lines written to stderr is larger than 0, + the difference is used as the number of lines written to stdout to skip. + Also, the "--help" output was fixed. (Hector - 1675286) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1685 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-13 Thomas Guyot-Sionnest + + * plugins/.cvsignore: ... Some CVS magic too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1684 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster2.README, plugins/Makefile.am, + plugins/check_cluster.c: automake magic for check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1683 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-11 Ton Voon + + * doc/RELEASING: Add news item to nagiosplugins.org + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1682 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, BUGS, ChangeLog, NEWS, configure.in, package.def: 1.4.8 + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1680 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-10 Thomas Guyot-Sionnest + + * po/POTFILES.in, po/de.po, po/fr.po, po/nagios-plugins.pot: Add some + check_ntp translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1679 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: - Fix possibility of printing scientific numbers + in perfdata + - Use fperfdata function for perfdata formatting + - Make the printing part a bit more flexible (similar to check_disk) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1678 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: Hopefully this is correct. + Need to make more changes so I'm commiting these. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1677 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-04 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix for getting dispersion instead of jitter on + older servers (like xntpd on Solaris). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1676 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-03 Holger Weiss + + * plugins/check_ntp.c: Fix the synchronization source selection on + big-endian systems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1675 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-03 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Temporary fix for jitter calculation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1674 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Holger Weiss + + * plugins/check_ntp.c: Don't rely on the assumption that the size of a + READSTAT response is a + multiple of sizeof(ntp_assoc_status_pair). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1673 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Ton Voon + + * lib/tests/Makefile.am: Add libgnu.a as regex functions required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1672 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-02 Thomas Guyot-Sionnest + + * plugins/check_ntp.c: Fix byte order in verbose logging + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1671 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Seems like we don't get any jitter sometimes. + While this needs to be fixed we should at least handle it gracefully. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1670 f882894a-f735-0410-b71e-b25c423dba1c + +2007-04-01 Matthias Eble + + * plugins/t/check_http.t: check_http.t: - added internet_access variable + to skip tests where internet access is required. + - added host_tcp_http2 variable for a webserver serving the string 'nagios' in index + - no tests are skipped if the new vars are not defined (existing installations) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1669 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c: utils_disk: fixed handling if check_disk -p is a + device (np_set_best_match()) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1668 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-31 Holger Weiss + + * NEWS: Various check_ntp fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1667 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Fix an out-of-bounds memcpy(3) and add a + realloc(3) error check in + jitter_request(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1666 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Add a warning to the verbose output if + jitter_request() found no + synchronization source. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1665 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Avoid division by zero. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1664 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Remove the '-O' option, as it's ignored. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1663 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-30 Ton Voon + + * m4/np_mysqlclient.m4: Use AS_HELP_STRING instead of ACX_HELP_STRING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1662 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, m4/np_mysqlclient.m4: Fix AC_CHECK_LIB for + mysql_init - add dependent libraries. mysql detection + separated into external m4 file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1661 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-30 Matthias Eble + + * lib/tests/test_disk.c, plugins/t/check_disk.t: Test Cases for + check_disk's -r, -R, -C and -g + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1660 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: check_disk: minor fix for -C if bestmatch != -p + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1659 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: + added regex functionality -r and -R. see np-devel mail (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1658 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk: + added grouping functionality. see np-devel mail (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1657 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c: check_disk + -C is more flexible now. See np-devel post (2007-02-10) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1656 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-29 Holger Weiss + + * THANKS.in, plugins/check_mysql.c: Fix argument processing (Felix Frank + - 1690697) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1655 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am: Set the "read" and "execute" bits only for + "user" and "group" in order + to not overwrite "--without-world-permissions" for the root plugins. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1654 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-29 Ton Voon + + * BUGS, ChangeLog, NEWS, configure.in, package.def: 1.4.7 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1652 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Adding help text for jitter flags + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1651 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-27 Thomas Guyot-Sionnest + + * THANKS.in, plugins-root/check_icmp.c: Fix bug #1494629 - check_icmp + fails after some time on FreeBSD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1650 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-25 Ton Voon + + * NEWS, configure.in: Reinstate --with-nagios-user/group and new + --without-group-permissions ./configure options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1649 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-22 Holger Weiss + + * THANKS.in, plugins/common.h: Increase MAX_INPUT_BUFFER from 1k to 8k + in order to increase I/O + performance (Stefan Meier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1646 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-16 Gavin Carr + + * plugins-scripts/check_ifoperstatus.pl: Fix bogus 'eq ( || )' + constructions in check_ifoperstatus.pl. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1642 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-12 Ton Voon + + * NEWS, plugins/check_ping.c, plugins/t/check_ping.t: check_ping's + timeout interval is only +1 if ping command has a timeout value. + Tests updated to check for 100% packet loss (always if ping has timeout), otherwise + will check for "timed out" string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1639 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-11 Thomas Guyot-Sionnest + + * plugins-root/t/check_icmp.t: Add tests for new check_icmp switch -m + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1638 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-11 Ton Voon + + * plugins-root/t/check_icmp.t, plugins/t/check_ping.t: Converted + check_ping.t to new-style testcases. Added test case for check_icmp - + requires sudo access + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1637 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fixed some help display. Removed -L from usage + as deprecated option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1636 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-08 Thomas Guyot-Sionnest + + * NEWS, THANKS.in, plugins-root/check_icmp.c: New switch to check_icmp + to set the minimum required hosts for success. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1635 f882894a-f735-0410-b71e-b25c423dba1c + + * config_test/child_test.c: Ficing C++ style comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1634 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fixed C++ style comments, but I don't get + why those lines were originally commented out. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1633 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-06 Ton Voon + + * plugins/check_http.c: Fix option handling (Nobuhiro Ban - 1657280) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1632 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Fixed compile errors in check_smtp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1631 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, THANKS.in, plugins/check_smtp.c: Fixed broken HELO cmd (Enrico + Scholz - 1675279) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1630 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in, plugins/check_procs.c: Use /usr/ucb/ps on Solaris + in preference to pst3 (problems in 64bit mode) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1629 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: Test failure if a filesystem which is a subset + of another fails the inode + check (Matthias Elbe - 1660953) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1628 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS, configure.in: Detect if check_mysql compile will work at + ./configure time, due to some + Redhat systems distributing mysql_config, but not the include files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1627 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Clearer message when --with-nagios-user is used for + ./configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1626 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ, INSTALLING, NEWS, README, plugins-root/Makefile.am: Root plugins + installed with world executable permissions. Removed references + to --with-nagios-user and --with-nagios-group in README + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1625 f882894a-f735-0410-b71e-b25c423dba1c + +2007-03-02 Ethan Galstad + + * plugins/check_mrtgtraf.c: Fix for broken check_mrtgtraf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1624 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-24 Thomas Guyot-Sionnest + + * doc/makefile: Fix the makefile ('[[' is bash-specific, 'rm -f' don't + remove directories) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1623 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-14 Ton Voon + + * NEWS, contrib/check_sybase: check_sybase now maintained in + NagiosExchange + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1622 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed typo in help for -M + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1621 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/t/check_tcp.t: Documentation fix re: + --escape flag. Fix of ./check_tcp test to webservers + to make it more standards compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1620 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-09 Ton Voon + + * NEWS, THANKS.in, po/.cvsignore, po/Makefile.in.in: Fixed MKINSTALLDIRS + problem on some systems - Lars Stavholm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1619 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-07 Ton Voon + + * lib/Makefile.config-opts, lib/parse_ini.c, + lib/tests/Makefile.config-opts, lib/tests/config-tiny.ini, + lib/tests/plugin.ini, lib/tests/test_ini.c: Added test files to test the + parse_ini.c routines. Requires libtap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1614 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-07 Holger Weiss + + * plugins/check_swap.c: Include before in + order to fix compilation on + OpenBSD (nsturm - 1653934) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1613 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Thomas Guyot-Sionnest + + * plugins/check_tcp.c: Correct vim typo in comment block :P + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1612 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Benoit Mortier + + * plugins/check_disk.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_overcr.c, + plugins/check_smtp.c, plugins/check_tcp.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: correcting some translation problems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1611 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 M. Sean Finney + + * lib/parse_ini.c, lib/parse_ini.h: initial version of ini file parsing + routines in C + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1610 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-06 Benoit Mortier + + * po/Makevars: adding PACKAGE_BUGREPORT to fix Report-Msgid-Bugs-To: + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1609 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-05 Ton Voon + + * AUTHORS, doc/RELEASING: Update list of team members. More notes on new + releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1608 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, NEWS, configure.in, package.def: For 1.4.6 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1606 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-02 Thomas Guyot-Sionnest + + * plugins/check_snmp.c: Fix parsing of multiple OIDs sets needmibs = + TRUE + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1605 f882894a-f735-0410-b71e-b25c423dba1c + +2007-02-01 Thomas Guyot-Sionnest + + * plugins/check_tcp.c, plugins/t/check_jabber.t: Fix progname being + partly set to upper case + Change formating of invalid hostname output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1604 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Adding NEWS entry for check_jabber + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1603 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Fix bug #1593073 Check_Log problem with + log rotation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1602 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-31 Ton Voon + + * plugins/t/check_jabber.t: Converted to new style object and Test::More + testing. Skipped jabber server + tests if not defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1601 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-31 Thomas Guyot-Sionnest + + * plugins/t/check_jabber.t: Add check_jabber test. Will ask for a jabber + host (default should be OK) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1600 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Fix Debian Bug #392610: check_jabber always + return warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1599 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Thomas Guyot-Sionnest + + * plugins/check_tcp.c: Jail does not requires any arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1598 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Ton Voon + + * config.rpath: make dist failing without config.rpath in top level. + File copied + from build-aux/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1597 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Thomas Guyot-Sionnest + + * plugins/check_tcp.c, plugins/t/check_tcp.t: Fix reporting bug using + expect, affecting (not fixing) Debian bug #392610: check_jabber always + return warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1596 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-30 Holger Weiss + + * configure.in: grep(1) "-q" isn't portable (e.g., it won't work on + Solaris 8), redirect + output to /dev/null instead. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1595 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Thomas Guyot-Sionnest + + * plugins/check_disk.c, plugins/t/check_disk.t: Revert 1643463 (reversed + disk thresholds) keeping the thresholds checks. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1594 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Holger Weiss + + * configure.in: Automake 1.10 says: "compiling `test_disk.c' with + per-target flags + requires `AM_PROG_CC_C_O' in `configure.in'". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1593 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-29 Ton Voon + + * build-aux/config.rpath: Move config.rpath into build-aux for automake + 1.10 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1592 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-28 Holger Weiss + + * INSTALLING: Remove description of deprecated ./configure + --with-nagios-{user,group} + options. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1591 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins/check_apt.c, + plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c, plugins/utils.c, plugins/utils.h: + Don't try to print `optarg' (which will be a NULL pointer) if an unknown + command line option was used, as this leads to a segfault on some + systems. The unknown option will be printed by getopt(3) anyway. So, + simply call print_usage() and exit UNKNOWN via the new usage5() instead. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1590 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-27 Thomas Guyot-Sionnest + + * plugins/check_disk.c, plugins/t/check_disk.t: Fix #1643463: + Miscalculating thresholds check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1589 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-27 Holger Weiss + + * lib/utils_base.c: Change the variable names `true' and `false' (which + are keywords in C99) + to `yes' and `no'. Fixes compilation when using SGI's MIPSpro c99(1). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1588 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Include GNULib's "dirname.h" in order to pull in the + base_name() + prototype, fixes compilation of check_procs using SGI's MIPSpro C. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1587 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS, NEWS: Fix typos. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1586 f882894a-f735-0410-b71e-b25c423dba1c + + * NEWS: Added "-o,--ssh-option=OPTION" which hands "-o OPTION" over to + ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard Lausser - 1472491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1585 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c: Include which is a + prerequisite for on + NetBSD and OpenBSD (at least). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1584 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-25 Ton Voon + + * Makefile.am, README, configure.in, doc/RELEASING: Update references to + NEWS instead of CHANGES. Fix compile of libtap + test programs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1583 f882894a-f735-0410-b71e-b25c423dba1c + + * build-aux/.cvsignore, build-aux/ltmain.sh, config.guess, config.sub, + configure.in: Use build-aux directory. Removed unnecessary checks in + configure.in. + Keeping libtool to link to libtap - can't find a suitable replacement method + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1582 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-24 Ton Voon + + * ACKNOWLEDGEMENTS, NEWS, config.rpath, configure.in, + doc/developer-guidelines.sgml, gl/.cvsignore, plugins/Makefile.am, + plugins/check_procs.c, po/POTFILES.in: Various cleanups in the syncing + with gnulib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1581 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, NEWS, config.rpath, configure.in, + doc/developer-guidelines.sgml, gl/Makefile.am, gl/alloca.c, + gl/alloca_.h, gl/asnprintf.c, gl/asprintf.c, gl/basename.c, + gl/c-strtod.c, gl/c-strtod.h, gl/cloexec.c, gl/cloexec.h, + gl/creat-safer.c, gl/dirname.c, gl/dirname.h, gl/dup-safer.c, + gl/error.c, gl/error.h, gl/exit.h, gl/exitfail.c, gl/exitfail.h, + gl/fcntl--.h, gl/fcntl-safer.h, gl/fd-safer.c, gl/fsusage.c, + gl/fsusage.h, gl/full-read.c, gl/full-read.h, gl/full-write.c, + gl/full-write.h, gl/gai_strerror.c, gl/getaddrinfo.c, gl/getaddrinfo.h, + gl/gethostname.c, gl/getloadavg.c, gl/getopt.c, gl/getopt1.c, + gl/getopt_.h, gl/getopt_int.h, gl/gettext.h, gl/inet_ntop.c, + gl/inet_ntop.h, gl/intprops.h, gl/m4/absolute-header.m4, + gl/m4/alloca.m4, gl/m4/arpa_inet_h.m4, gl/m4/c-strtod.m4, + gl/m4/cloexec.m4, gl/m4/codeset.m4, gl/m4/dirname.m4, gl/m4/dos.m4, + gl/m4/double-slash-root.m4, gl/m4/eoverflow.m4, gl/m4/error.m4, + gl/m4/exitfail.m4, gl/m4/extensions.m4, gl/m4/fcntl-safer.m4, + gl/m4/fstypename.m4, gl/m4/fsusage.m4, gl/m4/getaddrinfo.m4, + gl/m4/gethostname.m4, gl/m4/getloadavg.m4, gl/m4/getopt.m4, + gl/m4/gettext.m4, gl/m4/glibc2.m4, gl/m4/glibc21.m4, + gl/m4/gnulib-cache.m4, gl/m4/gnulib-common.m4, gl/m4/gnulib-comp.m4, + gl/m4/gnulib-tool.m4, gl/m4/iconv.m4, gl/m4/inet_ntop.m4, + gl/m4/inline.m4, gl/m4/intdiv0.m4, gl/m4/intl.m4, gl/m4/intldir.m4, + gl/m4/intmax.m4, gl/m4/intmax_t.m4, gl/m4/inttypes-pri.m4, + gl/m4/inttypes_h.m4, gl/m4/lcmessage.m4, gl/m4/lib-ld.m4, + gl/m4/lib-link.m4, gl/m4/lib-prefix.m4, gl/m4/lock.m4, + gl/m4/longdouble.m4, gl/m4/longlong.m4, gl/m4/ls-mntd-fs.m4, + gl/m4/mbchar.m4, gl/m4/mbiter.m4, gl/m4/mbrtowc.m4, gl/m4/memchr.m4, + gl/m4/minmax.m4, gl/m4/mountlist.m4, gl/m4/netinet_in_h.m4, + gl/m4/nls.m4, gl/m4/onceonly_2_57.m4, gl/m4/po.m4, + gl/m4/printf-posix.m4, gl/m4/progtest.m4, gl/m4/regex.m4, + gl/m4/safe-read.m4, gl/m4/safe-write.m4, gl/m4/size_max.m4, + gl/m4/snprintf.m4, gl/m4/socklen.m4, gl/m4/sockpfaf.m4, + gl/m4/ssize_t.m4, gl/m4/stdbool.m4, gl/m4/stdint.m4, gl/m4/stdint_h.m4, + gl/m4/strcase.m4, gl/m4/strdup.m4, gl/m4/strndup.m4, gl/m4/strnlen.m4, + gl/m4/sys_socket_h.m4, gl/m4/uintmax_t.m4, gl/m4/ulonglong.m4, + gl/m4/unistd-safer.m4, gl/m4/unistd_h.m4, gl/m4/vasnprintf.m4, + gl/m4/vasprintf.m4, gl/m4/visibility.m4, gl/m4/vsnprintf.m4, + gl/m4/wchar.m4, gl/m4/wchar_t.m4, gl/m4/wctype.m4, gl/m4/wcwidth.m4, + gl/m4/wint_t.m4, gl/m4/xalloc.m4, gl/m4/xsize.m4, gl/m4/xstrndup.m4, + gl/malloc.c, gl/mbchar.c, gl/mbchar.h, gl/mbuiter.h, gl/memchr.c, + gl/minmax.h, gl/mountlist.c, gl/mountlist.h, gl/open-safer.c, + gl/pipe-safer.c, gl/printf-args.c, gl/printf-args.h, gl/printf-parse.c, + gl/printf-parse.h, gl/regcomp.c, gl/regex.c, gl/regex.h, + gl/regex_internal.c, gl/regex_internal.h, gl/regexec.c, gl/safe-read.c, + gl/safe-read.h, gl/safe-write.c, gl/safe-write.h, gl/size_max.h, + gl/snprintf.c, gl/snprintf.h, gl/socket_.h, gl/stdbool_.h, gl/stdint_.h, + gl/strcase.h, gl/strcasecmp.c, gl/strdup.c, gl/strdup.h, + gl/stripslash.c, gl/strncasecmp.c, gl/strndup.c, gl/strndup.h, + gl/strnlen.c, gl/strnlen.h, gl/strnlen1.c, gl/strnlen1.h, gl/unistd--.h, + gl/unistd-safer.h, gl/unistd_.h, gl/vasnprintf.c, gl/vasnprintf.h, + gl/vasprintf.c, gl/vasprintf.h, gl/vsnprintf.c, gl/vsnprintf.h, + gl/wchar_.h, gl/wctype_.h, gl/wcwidth.h, gl/xalloc-die.c, gl/xalloc.h, + gl/xmalloc.c, gl/xsize.h, gl/xstrndup.c, gl/xstrndup.h, lib/Makefile.am, + lib/basename.c, lib/c-strtold.c, lib/gettext.h, lib/realloc.c, + lib/snprintf.c, lib/strtod.c, lib/tests/Makefile.am, lib/unlocked-io.h, + lib/xalloc.h, lib/xmalloc.c, m4/Makefile.am.in, m4/afs.m4, + m4/basename.m4, m4/extensions.m4, m4/fstypename.m4, m4/inttypes.m4, + m4/longlong.m4, m4/np_coreutils.m4, m4/np_curl.m4, m4/restrict.m4, + m4/signed.m4, m4/ulonglong.m4, m4/unlocked-io.m4, + plugins-root/Makefile.am, plugins/Makefile.am, plugins/check_smtp.c, + plugins/common.h, plugins/getaddrinfo.c, plugins/getaddrinfo.h, + plugins/gethostbyname.c, plugins/gethostbyname.h, plugins/netutils.h, + tools/setup, tools/update_coreutils: Sync with gnulib - lots of + extraneous code removed in preference to GNU code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1580 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-23 Holger Weiss + + * THANKS.in, plugins/check_ssh.c: Support `check_ssh --hostname=ADDRESS' + (but keep `--host=ADDRESS' for backward + compatibility) (Ville Mattila - 1642780) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1579 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Location updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1578 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Add missing `break' to the switch-case block that + handles the `-m' option + (Nobuhiro Ban - 1642682) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1577 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_radius.c: Initialize `data' to zero, fixes + potential segfault (Nobuhiro Ban - 1642658) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1576 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/mountlist.c: Add support for statvfs(2) which is needed in order + to compile the plugins on + NetBSD 3.0 and newer. The current coreutils release supports statvfs(2), so + this patch won't be needed anymore when updating the coreutils files. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1575 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-22 Holger Weiss + + * plugins/check_by_ssh.c: Added "-o,--ssh-option=OPTION" which hands "-o + OPTION" over to ssh(1) and + "-q,--quiet" which tells ssh(1) to suppress warnings (Gerhard Lausser - 1472491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1574 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 Ton Voon + + * doc/developer-guidelines.sgml: Updated policy on contributed plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1573 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/LEAVERS, doc/NEW_STARTERS, doc/RELEASING: Administrative notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1572 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 M. Sean Finney + + * plugins/check_ntp.c: compilation fixes for check_ntp.c: + - check_ntp.c:290: warning: overflow in implicit constant conversion + fixed with an explicit cast to int8_t. + - check_ntp.c:544: warning: pointer of type ‘void *’ used in arithmetic + fixed by casting to ptrdiff_t before arithmetic and (void*) afterwards + - in TVtoNTP64, cast arithmetic result passed to R32 as uint64_t. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1571 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-20 Thomas Guyot-Sionnest + + * plugins/check_http.c, plugins/check_ldap.c: Fix bug #1632091: printf + format string typos. Add some more cosmetic changes. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1570 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: Fix bug #1632078: critical threshold % + incorrectly displayed by check_icmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1569 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, THANKS.in, plugins/netutils.c: Fix bug #1632072 pointer error + in plugins/netutils.c. Add changelog entry for previous commit. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1568 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-17 Thomas Guyot-Sionnest + + * THANKS.in, plugins/check_procs.c: Fix bug #1630970 Fix for buffer + overflow of check_procs procprog string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1566 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-08 Ton Voon + + * CHANGES, THANKS.in, plugins/t/check_disk.t: Added notes about + check_disk perf data fix. Added test to check perf data is + same when mount points reversed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1565 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-07 Thomas Guyot-Sionnest + + * plugins/check_disk.c: Fix bug #1627970: check_disk performance output + for more then one partition + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1564 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-06 Thomas Guyot-Sionnest + + * plugins/check_ping.c: Fix bug #1629008: check_ping fails to handle + Packet filtered error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1563 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Revert last patch: it works but not really for + the reason I though. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1562 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix the way check_ping calculate the maximum run + time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1561 f882894a-f735-0410-b71e-b25c423dba1c + +2007-01-04 Thomas Guyot-Sionnest + + * plugins/check_real.c: Fix bug #1574863: check_real does not accept the + '-v' option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1560 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix bug #1592605: check_ping times out + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1559 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/README, tools/distclean: Adding my distclean script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1558 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-23 Thomas Guyot-Sionnest + + * plugins/t/check_snmp.t: Regexps in check_snmp tests fails where they + shouldn't. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1557 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-21 Thomas Guyot-Sionnest + + * NPTest.pm: - Fixing small error (wrong file name) in NPTest.pm + documentation. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1556 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-20 Ton Voon + + * CHANGES, THANKS.in, plugins/check_http.c, plugins/t/check_http.t: + Removed unused timestamp variable (Matthias Eble) + Fixed redirection test. Added extra tests for funny syntax when checking + certificates, updated help for more common syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1555 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, + plugins/t/check_disk.t: Fixed inode thresholds, regressed from previous + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1554 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-20 Benoit Mortier + + * po/de.po, po/fr.po, po/nagios-plugins.pot: updated the + nagios-pulgins.pot files now that localization is clean + first pass at updating the french locale + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1553 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-12 Ton Voon + + * plugins-scripts/t/utils.t: Enhanced test for single letters in fqdn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1549 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: Allow single characters in fqdn (Dave + Alden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1548 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-07 Ton Voon + + * CHANGES, THANKS.in, configure.in: Fixed HP/UX's swapinfo command for + check_procs (Dick van den Burg - 1573700) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1547 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_disk.c, plugins/check_swap.c, + plugins/common.h, plugins/netutils.h: Fix coredump on 64bit Solaris. + Also adds more error conditions and moves + swap specific includes out of common.h (Duncan Ferguson - 1588031) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1546 f882894a-f735-0410-b71e-b25c423dba1c + +2006-12-06 Ton Voon + + * plugins/Makefile.am: Move SSL libs to correct order per plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1545 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Only include -lssl for plugins that require it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1544 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Flag common compile error because of no ar on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1543 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Remove CVS files from distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1542 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Add libtool requirement for development + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1541 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-09 Ton Voon + + * CHANGES, THANKS.in, plugins/check_ping.c, plugins/netutils.c: Reduced + DNS lookups in check_ping and netutils.c in IPv6 configurations + (Pawel Malachowski) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1535 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-03 Ton Voon + + * lib/Makefile.am, lib/alloca.c, lib/alloca_.h: Add alloca files, + required for *BSD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1534 f882894a-f735-0410-b71e-b25c423dba1c + +2006-11-01 Ton Voon + + * ChangeLog, configure.in, package.def: For 1.4.5 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1532 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-27 Ton Voon + + * plugins-scripts/t/utils.t, plugins-scripts/utils.pm.in: More edge + testcases. Allow anything if ends with a . as long as correct + characters + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1531 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-26 Ton Voon + + * NPTest.pm: New test variables default to "none", so no changes + required to tinderbox satelites + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1530 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-scripts/check_oracle.sh: Fixed error if + dba_free_space has no free segments (Florian Gleixner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1529 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/Makefile.am, plugins-scripts/t/utils.t, + plugins-scripts/utils.pm.in: Fixed regression where hostnames with + hyphens were rejected (1581402 - Holger Weiss) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1528 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_traffic-0.90b.tar.gz: Removing unnecessary + tarball + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1527 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_disk.c, plugins/check_http.c: Remove C style + comments (1583467 - Markus Baertschi) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1526 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-24 Benoit Mortier + + * plugins-root/check_icmp.c: more fixes and removal of certain sentences + not needed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1525 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c, plugins/check_nt.c: last localization fixes + for core plugins in c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1524 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: next round of localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1523 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-24 Ton Voon + + * plugins-root/Makefile.am, plugins-root/check_icmp.c: Fixed compile on + non-glibc platforms + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1522 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Restored accidently regressed fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1521 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-23 Benoit Mortier + + * plugins/check_http.c: localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1520 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: first pass a making check icmp respecting + nagiosplugins rules + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1519 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-22 Benoit Mortier + + * plugins/check_nt.c: latest localization fixes for tonight ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1518 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1517 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: putting default template for copyright and + explanations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1516 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c: revert mistake when commiting fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1515 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_icmp.c, plugins/check_apt.c, plugins/check_procs.c: + more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1514 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-20 Ton Voon + + * plugins/check_snmp.c: Reverting back accidently regressed code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1513 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-20 Benoit Mortier + + * plugins/check_mrtg.c: more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1512 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/check_dhcp.c, plugins/check_apt.c: localization updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1511 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Benoit Mortier + + * plugins/check_snmp.c: adding missing check_snmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1510 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: another round of localization + cleaning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1509 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Ton Voon + + * BUGS, ChangeLog, configure.in, package.def: For 1.4.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1507 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Added info re: 1.4.4 in prep for release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1506 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: Initialise strings for Fedora Core 5 + (Henning Schmiedehausen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1505 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: Removed asprintf for perf data (Craig + Orsinger, Robby Giffin - 1310495) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1504 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_snmp.c: type variable not cleared in Sol 10 + (Kyle Tucker) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1503 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_http.c, plugins/t/check_http.t: Redirection + error if other headers beginning with L (Aravind Gottipati - 1562572) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1502 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins-scripts/utils.pm.in: Allow hostnames beginning with + digits (O'Shaughnessy Evans - 1567390) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1501 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_smtp.t: Added tests for SMTP servers without TLS and + with TLS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1500 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-19 Benoit Mortier + + * plugins/check_apt.c, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide_smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_mysql_query.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_ntp.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c: + first pass at cleaning localization for new release + first pass at making all the headre be the same licence, plugin, etc... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1499 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-18 Ton Voon + + * plugins/check_disk.c, plugins/t/check_disk.t: Re-added perf data to + check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1498 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/tests/test_disk.c, lib/utils_disk.h: Fix tests for exact matches + when searching filesystems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1497 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/utils_base.c, lib/utils_base.h: Cater for different errors when + setting thresholds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1496 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-12 Ton Voon + + * plugins/check_smtp.c, plugins/t/check_smtp.t: Resend EHLO after TLS + negotiation as per RFC3207 (Holger Weiss - 1482832) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1493 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: Removed extraneous comma in perf data output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1492 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/t/check_disk.t: Remove the "- free + space" if status is OK + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1491 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, THANKS.in, plugins/check_disk.c, plugins/t/check_disk.t: + Fixed output from -e in check_disk (Andreas Behal) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1490 f882894a-f735-0410-b71e-b25c423dba1c + +2006-10-02 Ton Voon + + * plugins/t/check_load.t: Fix test failure on poseidon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1487 f882894a-f735-0410-b71e-b25c423dba1c + +2006-09-21 Ton Voon + + * THANKS.in, plugins/check_nwstat.c: Added perfdata for most variables + and new parameters: VMU, VMF, + VMP, NRMH, NRMP, NRMM, NRMS, NSS1 to NSS7 (Christian Mies) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1480 f882894a-f735-0410-b71e-b25c423dba1c + +2006-09-02 M. Sean Finney + + * lib/utils_base.h, plugins/utils.h: - explicitly include utils_base.h + from utils.h + - put utils.h inside of an #ifndef/#endif + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1474 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: - fix for warning/critical timeouts in + check_tcp.c, in which the plugin + would exit with a usage error if non-int timeouts were passed. + - change --warning-time/--critical-time to just --warning/--critical, + as it's what --help says. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1473 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-14 Ton Voon + + * THANKS.in, plugins/check_disk.c: Fixed inode percent free output (Mike + Emigh - 1531899) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1469 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_ntp.t: Fixed skip of no ntp test + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1468 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-11 Ton Voon + + * plugins/check_ntp.c, plugins/t/check_ntp.t: Catch no responses from + any server (1538341 - nmdias) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1467 f882894a-f735-0410-b71e-b25c423dba1c + +2006-08-03 Ton Voon + + * tools/tinderbox_build: Interpret the snapshot datestamp as GMT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1465 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-31 Harper Mann + + * plugins/check_nt.c: Bug: 694259 fix. After consulting with the target + service authors, we + decided to keep the default port as 1248 and add a note about other services + sometimes using this port and suggesting to change the port. Closing bug. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1464 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-31 Ton Voon + + * doc/developer-guidelines.sgml: M4 requirement for developer platform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1463 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-29 Ton Voon + + * plugins-root/check_dhcp.c, plugins/common.h: Fix two Solaris compile + problems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1462 f882894a-f735-0410-b71e-b25c423dba1c + + * po/POTFILES.in: Remove reference to check_udp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1461 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-28 Ton Voon + + * configure.in, plugins-scripts/Makefile.am, plugins/Makefile.am: + Cleanup references to old check_udp and INSTALL_OPTS. Error if + --with-nagios-user or --with-nagios-group specified for configure + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1460 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, plugins/Makefile.am, plugins/check_udp.c, + plugins/t/check_udp.t: check_udp.c deprecated and check_udp now linked + to check_tcp. check_udp2 removed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1459 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-27 Ton Voon + + * doc/developer-guidelines.sgml: Example ranges (Nathan Vonnahme) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1458 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-19 Ton Voon + + * THANKS.in, configure.in: Stricter autoconf 2.60 rules (Lance Albertson + - 1522900) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1457 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix to add uintmax_t, for check_disk.c compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1456 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix for CHAR_MAX on Solaris 9 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1455 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-14 Ton Voon + + * lib/Makefile.am, lib/utils_base.c: Missing header files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1454 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix inode percents using coreutils' percentage + calculation technique + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1453 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-13 Ton Voon + + * CHANGES, lib/tests/test_utils.c, lib/utils_base.c, lib/utils_base.h, + lib/utils_disk.c, lib/utils_disk.h, plugins/check_disk.c, + plugins/t/check_disk.t: Major fixes to check_disk. Now should return + same data as df + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1452 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in, lib/Makefile.am, lib/tests/.cvsignore, + lib/tests/Makefile.am, lib/tests/README, lib/tests/test_disk.c, + lib/tests/test_disk.t, lib/tests/test_utils.c, lib/tests/test_utils.t, + plugins/Makefile.am, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, plugins/utils.c, + plugins/utils.h, plugins/utils_disk.c, plugins/utils_disk.h: Move new + util_* functions to lib/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1451 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/basename.c, lib/dirname.h, m4/basename.m4, + m4/dos.m4, m4/np_coreutils.m4, plugins/check_procs.c, plugins/utils.c, + plugins/utils.h: Using coreutils' base_name function because of + portability issues with + Tru64 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1450 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-12 Ton Voon + + * plugins/check_disk.c, plugins/t/check_disk.t, plugins/utils_disk.c, + plugins/utils_disk.h: Added -E option for exact match of filesystem. + Restructured main filesystem + loop. Added extra tests for possible duplicate filesystems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1449 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/tests/.cvsignore, + plugins/tests/test_disk.c, plugins/utils_disk.c, plugins/utils_disk.h: + Moving parameter_list into utils_disk.h. Given list of mount points, can + now work out best match or exact match. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1448 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_disk.c, plugins/tests/Makefile.am, + plugins/tests/test_disk.c, plugins/tests/test_disk.t, + plugins/utils_disk.c, plugins/utils_disk.h: Moving check_disk functions + into utils_disk.c and testing them + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1447 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-11 Ton Voon + + * lib/creat-safer.c, lib/dup-safer.c, lib/fcntl--.h, lib/fcntl-safer.h, + lib/fd-safer.c, lib/open-safer.c, lib/pipe-safer.c, lib/unistd--.h, + lib/unistd-safer.h, m4/fcntl-safer.m4, m4/np_coreutils.m4, + m4/unistd-safer.m4: Extra files from coreutils required for getloadavg.c + to compile + on Tru64 (Ciro Iriarte - 1520331) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1446 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-10 Ton Voon + + * lib/Makefile.am: Didn't add intprops.h into distribution correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1445 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-07 Harper Mann + + * plugins/urlize.c: Added check for two arguments. Was segfaulting if no + or one arg. Now returns + help. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1444 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-05 Ton Voon + + * plugins-scripts/check_mailq.pl: Fixed checking of return codes from + external mailq programs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1443 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/tinderbox_build: Add instructions for manually sending Tinderbox + build logs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1442 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/intprops.h: Missing intprops.h for Tru64 (Ciro + Iriarte - 1517379) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1441 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-04 Ton Voon + + * THANKS.in, m4/alloca.m4, m4/np_coreutils.m4: Added alloca.h check and + fixed locale.h, wchar.h (Ari Pollak - 1516578) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1440 f882894a-f735-0410-b71e-b25c423dba1c + +2006-07-03 Ton Voon + + * plugins/check_dig.c: Fixed -p getopt call (Allan Bennett - 1511650) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1439 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, lib/c-strtod.c, lib/c-strtod.h, lib/c-strtold.c, + m4/c-strtod.m4, m4/np_coreutils.m4, plugins/Makefile.am: Fixed compile + on Tru64 5.1b (Ciro Iriarte - 1515435) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1438 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-21 Benoit Mortier + + * plugins/check_snmp.c, plugins/check_ssh.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1437 f882894a-f735-0410-b71e-b25c423dba1c + + * po/LINGUAS: fixing bug id #1509699 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1436 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-20 Benoit Mortier + + * plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c: + cleaning help and usage + license + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1435 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-18 Benoit Mortier + + * plugins/check_disk.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/negate.c, plugins/netutils.c, + plugins/popen.c, plugins/runcmd.c, plugins/sslutils.c, plugins/urlize.c, + plugins/utils.c: updating help and usage and license + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1434 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-17 Benoit Mortier + + * plugins/check_hpjd.c, plugins/check_nt.c, plugins/check_ntp.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c: cleaning up help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1433 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-15 Benoit Mortier + + * plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/check_nagios.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1432 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: cleaning help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1430 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Benoit Mortier + + * plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c: updating the help and usage for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1427 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Ton Voon + + * INSTALLING, doc/developer-guidelines.sgml: Updated requirements for + development platform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1426 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-14 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c: + starting the BIG locale update ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1425 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-07 M. Sean Finney + + * contrib/check_linux_raid.pl: some gratuitous whitespace changes, and a + fix to the "recovery =" detection + logic in check_linux_raid.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1418 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: removed stale references to + PATH_TO_NTPFOO, as it's no longer used. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1417 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-07 Ton Voon + + * plugins-root/Makefile.am: Do not install setuid programs unless run as + root + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1416 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-root/Makefile.am, tools/setup: Fixed two build problems re: + libtool and pst3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1415 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-06 M. Sean Finney + + * plugins/check_pgsql.c: modify the is_pg_dbname() function to allow + databases with '-' in their name. + reference: sf tracker #1500752 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1414 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-03 M. Sean Finney + + * configure.in: removed the -R for openssl, as it should be figured out + automatically by + libtool and also controlled via the --enable-rpath/--disable-rpath configure + options. furthermore keeping it in forces the rpath option on in spite of + what's passed on the configure line. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1413 f882894a-f735-0410-b71e-b25c423dba1c + +2006-06-01 M. Sean Finney + + * contrib/check_linux_raid.pl: gave some TLC to check_linux_raid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1412 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-30 Ton Voon + + * configure.in: Default to search path for mysql_config + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1411 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: For reporting check_radius compile problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1410 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, config.guess, config.sub, doc/developer-guidelines.sgml, + ltmain.sh: Added libtool files, at version 1.5.22, into CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1409 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ethan Galstad + + * plugins-root/check_dhcp.c: Applied patch for responses from + helpers/relays, cleaned up different coding styles for consistency + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1408 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ton Voon + + * lib/regex.o: Removed unnecessary file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1407 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/common.h: Gettext fixes to sync + with coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1406 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ethan Galstad + + * plugins-root/check_dhcp.c: Fixed short interface name length, UNKNOWN + return code (patches from tracker) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1405 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-25 Ton Voon + + * plugins/check_http.c, plugins/t/check_http.t: Option to invert results + from a regexp pattern match + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1404 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/.cvsignore, lib/regcomp.c, lib/regex.c, lib/regex.h, + lib/regex.o, lib/regex_internal.c, lib/regex_internal.h, lib/regexec.c, + lib/strcase.h, m4/.cvsignore, m4/np_coreutils.m4, m4/regex.m4, + m4/restrict.m4, plugins/check_apt.c, plugins/check_http.c, + plugins/check_smtp.c, plugins/check_snmp.c: Use coreutils' regexp + libraries, so regexp always available now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1403 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/ls-mntd-fs.m4: Sync with coreutils 5.96 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1402 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-24 Ton Voon + + * THANKS.in, configure.in: Fix for mysql 3.x (Jeremy Reed, Michael + Tiernan - 1491936) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1401 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Reminder of no inline variable + declarations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1400 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Variables need to be declared at top of code for + better portability + (Gerhard Lausser) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1399 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-19 Ton Voon + + * configure.in, doc/developer-guidelines.sgml: Requirement of automake + 1.8.3, as coreutils needs it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1398 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, config.rpath, mkinstalldirs, po/.cvsignore, + po/remove-potcdate.sin: Adding more required files from gettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1397 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-18 Ton Voon + + * tools/setup: Bug in Makefile.am creation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1396 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ABOUT-NLS, m4/Makefile.am, m4/Makefile.am.in, + po/.cvsignore, po/Makefile.in.in, tools/setup: Fixes from coreutils + sync: some files now required and removed generateable files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1395 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, Makefile.am, configure.in, doc/developer-guidelines.sgml, + lib/Makefile.am, lib/cloexec.c, lib/cloexec.h, lib/error.c, lib/error.h, + lib/exit.h, lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, + lib/fsusage.h, lib/full-read.c, lib/full-read.h, lib/full-write.c, + lib/full-write.h, lib/getloadavg.c, lib/getopt.c, lib/getopt1.c, + lib/getopt_.h, lib/getopt_int.h, lib/gettext.h, lib/malloc.c, + lib/mountlist.c, lib/mountlist.h, lib/realloc.c, lib/safe-read.c, + lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, lib/stdbool_.h, + lib/strtod.c, lib/unlocked-io.h, lib/xalloc-die.c, lib/xalloc.h, + lib/xmalloc.c, m4/.cvsignore, m4/Makefile.am, m4/afs.m4, m4/codeset.m4, + m4/error.m4, m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, + m4/fsusage.m4, m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, + m4/intdiv0.m4, m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4, + m4/isc-posix.m4, m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, + m4/lib-prefix.m4, m4/longdouble.m4, m4/longlong.m4, m4/ls-mntd-fs.m4, + m4/malloc.m4, m4/mountlist.m4, m4/nls.m4, m4/np_coreutils.m4, + m4/onceonly_2_57.m4, m4/po.m4, m4/progtest.m4, m4/realloc.m4, + m4/signed.m4, m4/stdbool.m4, m4/stdint_h.m4, m4/uintmax_t.m4, + m4/ulonglong.m4, m4/unlocked-io.m4, m4/wchar_t.m4, m4/wint_t.m4, + m4/xalloc.m4, plugins-root/.cvsignore, plugins-root/check_dhcp.c, + plugins/.cvsignore, plugins/check_disk.c, plugins/common.h, + plugins/tests/.cvsignore, po/.cvsignore, tools/setup: Synchronise with + coreutils 2.95. Gettext now synced with coreutils, + so no longer development platform requirement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1394 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-17 Ton Voon + + * configure.in: Fix for loading SSL libraries at runtime + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1393 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: Fix compile problems on + Solaris for pst3 and ssl libs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1392 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-15 Ton Voon + + * CHANGES, contrib/check_disk_snmp.pl: check_disk_snmp.pl removed. + Notice added to CHANGES + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1391 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Changed snapshot generator due to cvs changes on SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1390 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-03 Ton Voon + + * doc/LEAVERS: Leavers process documented + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1389 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-02 Ton Voon + + * plugins/check_disk.c: Inode thresholds not always being initialised + (James Fidell - 1476457) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1388 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: New check_ntp and check_apt plugins by Sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1387 f882894a-f735-0410-b71e-b25c423dba1c + +2006-05-01 M. Sean Finney + + * configure.in, plugins-scripts/Makefile.am, plugins/Makefile.am, + plugins/check_ntp.c, plugins/common.h, plugins/runcmd.c: - check_ntp: + - now roughly feature-complete. + - various bugfixes, esp. offset calculation. + - enhanced the asynchronous offset polling to set requests that + haven't recieved a response in >= 1 second to stale and retransmit them, + which results in much better performance on unreliable networks. + - we only spend timeout/2 seconds polling offsets, and if we don't get + everything by that point we work with what we have and set status to + warning/critical depending on how much data we have. + - set the same defaults as the perl script. + - commit changes to configure.in to support automatic building of check_apt + (if apt-get is installed and regex libraries available) and check_ntp + (unconditionally), now defaulting to check_ntp.c instead of the perl script. + if this is an issue we can back out the commit of course. an eye + should be kept on check_ntp building and running correctly in different + environments, esp. 64-bit and big-endian platforms, and those with more + "esoteric" API's (do any of the platforms not have poll()?). + - similar changes to Makefile.am's. + - common.h: add statement to include sys/poll.h + - runcmd.c: exit STATE_UNKNOWN if execve() fails. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1386 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-28 Ton Voon + + * configure.in: Remove stupid error where pst3 was always compiled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1385 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: Added pst3 into distribution + (Jason Kau - 1476451) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1384 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-27 Ton Voon + + * configure.in, plugins/check_procs.c, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: Internal version of basename if one + not found in system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1383 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-19 Ton Voon + + * plugins/t/check_nagios.t: Fix check_nagios tests on MacOSX 10.4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1382 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-19 Subhendu Ghosh + + * ChangeLog: ChangeLog update - release pending + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1380 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: version update - release pending + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1379 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-17 Benoit Mortier + + * po/fr.po: Final commit of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1378 f882894a-f735-0410-b71e-b25c423dba1c + + * po/fr.po: another big chunk of fr.po + + Still 20 to go ;) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1377 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-16 Benoit Mortier + + * po/fr.po: big revision of po file for 1.4.3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1376 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-15 Benoit Mortier + + * po/fr.po: second part of fr.po updating + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1375 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-14 Benoit Mortier + + * po/de.po, po/fr.po, po/nagios-plugins.pot: updated pot file + sarted updating fr.po for nagios 1.4.3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1374 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-12 M. Sean Finney + + * plugins/check_ntp.c: the offset_requests are now parallelized. still + stuff needs to be + done (conveniently marked with XXX), but on well behaving networks + the plugin should behave more or less identical to check_ntp.pl now. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1373 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: added a currently unused but "good for reference" + version of offset_request + which attempts to behave more like ntpdate, but this doesn't yet and + the code isn't actually used yet. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1372 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-11 M. Sean Finney + + * plugins/check_ntp.c: another big code-commit to check_ntp. jitter + calculations now work, and + the program is becoming much closer on the packet-for-packet level to + how check_ntp.pl behaves. i'll send an email in the morning :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1371 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-06 Ton Voon + + * THANKS.in, plugins/utils.c: Stop coredump on Solaris if arg not + specified (Jason Kau - 1465288) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1370 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-05 Ton Voon + + * CHANGES: Notice added re: check_udp in next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1369 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Use pid_t for pids (1463853) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1368 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/t/check_http.t: Allow multiple -k + parameters (Gerd Mueller - 1457726) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1367 f882894a-f735-0410-b71e-b25c423dba1c + +2006-04-05 M. Sean Finney + + * plugins/check_apt.c: finally??? cvs works again???? let me dig up my + week-old cvs + commit message..... + + i'm becoming very happy with check_apt now :) + - now has support for an externally (configure.in) path to apt-get, + though i still have that in #ifdefs for the time being. + - support for defining what packages are "critical updates", via + the already-existing security regexp or overridable on the cmdline + - allow overriding of apt-get cmdline options + - introduce a "no upgrade" in case someone just wants to check that + they can download the package lists with -u but not check for upgrades. + might need to change the name of this option to prevent confusion. + - improved -h documentation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1366 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-29 Ton Voon + + * THANKS.in, plugins/check_tcp.c, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: New function to for escaped strings + from command line for send/quit. + Adapted from Sebastian Wiesinger's patch (1292404) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1365 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm: Will die if signal received from a testCmd + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1364 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_udp.t: Allow 1 second delay in check_udp timeout + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1363 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Fix possible timeout issue on hostname_invalid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1362 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_dns.t: Fix test if response time is one second + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1361 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-29 M. Sean Finney + + * plugins/check_apt.c: now support for detecting critical/security + updates, which sets + the return code to STATE_CRITICAL instead of just STATE_WARNING + as it was previously doing. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1360 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-27 Ton Voon + + * plugins/t/check_udp.t: Set timeout within nc, rather than the test + script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1359 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed bug with malloc of wrong size + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1358 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-24 Ton Voon + + * plugins/t/check_dns.t: Fixing defaults to work + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1357 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Reintroduced --with-mysql configure option. Note about SSL + cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1356 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: -C now implies -S/--ssl as well + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1355 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_hpjd.t, plugins/t/check_http.t: Tests converted to new + style + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1354 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/t/check_udp.t: udp checks require and + send and receive option. Tests updated so if + nc is available, will check send and receive working correctly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1353 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 M. Sean Finney + + * plugins/check_apt.c: - addition of include/exclude option for package + names in check_apt, + using POSIX regexp support. + - various commenting and tidying of code/logic/output. + - still haven't committed the Makefile.am/configure.in stuff. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1352 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 Ton Voon + + * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: check_disk + now errors if a specified directory does not exist (cf df /foo) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1351 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t: Some versions of Test::More do not like the + m#foo# syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1350 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/check_disk.c, plugins/t/check_disk.t: Incorrect + output when checking non-existent disk (John Rouillard - 1326050) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1349 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-23 M. Sean Finney + + * plugins/check_apt.c: more work on check_apt. more graceful error + handling and information + reporting, a couple new cmdline options. still not quite ready + for prime-time, maybe tomorrow :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1348 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-22 Ton Voon + + * REQUIREMENTS, configure.in: Reinstated --with-mysql option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1347 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/t/check_dns.t: Added warning and critical + response times (John Rouillard - 1343159) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1346 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_pop.t: Convert to new style tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1345 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, plugins/check_tcp.c: Options to change line ends for -s and + -q (John Rouillard - 1346104) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1344 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Remove PATH restriction + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1343 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/t/check_dns.t: New style tests. Cleanup + of presentation of help. Added '' around -a checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1342 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: Typo (Thomas Guettler - 1433447) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1341 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh, plugins-scripts/utils.sh.in: Remove + hardlink to /bin/sed. Leave to PATH (Abs - 1391483) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1340 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-22 M. Sean Finney + + * plugins/check_apt.c: initial version of a check_apt plugin... not + editing configure/Makefile.am's + until i'm happier with it (better output, better ways to define warning + vs. critical thresholds... etc). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1339 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-21 Ton Voon + + * THANKS.in, configure.in: Stop check_dns from compiling if nslookup + does not exist (Sakari Lehtonen - + 1412721) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1338 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_load.t: Updated to new Test::More method for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1337 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fix for mysql 3.x + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1336 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Return CRITICAL if hostname invalid, as per + guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1335 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Patch to workaround SFnot having libtool installed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1334 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, REQUIREMENTS, THANKS.in, configure.in, plugins/Makefile.am, + plugins/tests/Makefile.am: mysql discovery based on mysql_config (Johan + Fischer - 1359414) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1333 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-20 M. Sean Finney + + * plugins/check_ntp.c: - shuffling some code around to keep things tidy. + - now average the result of 4 queries just as ntpdate does + - put things in place for jitter calculation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1332 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ntp.c: ipv6 support for c-version of check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1331 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-18 M. Sean Finney + + * plugins/check_ntp.c: initial version of the pure-c check_ntp + implementation. jitter not yet + implemented, and a couple other misc things to do, so i haven't + yet patched Makefile.am + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1330 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: return-logic related fix for cert checking, + thanks to emmet hogan. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1329 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-17 Ton Voon + + * plugins/tests/test_utils.t: Better error message re: tap library + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1328 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS, configure.in, plugins/Makefile.am, + plugins/check_mysql.c, plugins/check_mysql_query.c, + plugins/t/check_mysql.t: mysql detection cleanup: fixes runtime linking, + autodetection of main + locations, detection of lib64 and different layouts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1327 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added requirement for developer system + to have gnu libtool + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1326 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-16 Ton Voon + + * configure.in, plugins/tests/Makefile.am, tools/setup: Using libtool to + get runpath for tap library + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1325 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-15 Ton Voon + + * THANKS.in, plugins/check_mysql.c, plugins/t/check_mysql.t: Alert on + amount of time a slave is behind (Steven Kreuzer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1324 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-13 M. Sean Finney + + * plugins/check_swap.c: fix for (tracker id 1420741) + "check_swap: incorrect totals for multiple partitions (BSD)" + thanks to scott thompson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1323 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-13 Ton Voon + + * plugins/check_ping.c: Change warning message if there is stderr + output. This catches a problem + where time was shifting backwards on a linux VMware guest during the ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1322 f882894a-f735-0410-b71e-b25c423dba1c + +2006-03-07 Ton Voon + + * plugins/t/check_http.t: Added tests for two external websites with + certificates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1321 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Tests re-written in new object format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1320 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-24 Ton Voon + + * doc/developer-guidelines.sgml: Updated doc as tap library is now + automatically discovered + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1319 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/tests/Makefile.am: Use the installed tap library + instead of requesting a compiled object + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1318 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-17 Ton Voon + + * THANKS.in, plugins/popen.c: SIGALRM could be received before + child_process is created (Jason Crawford) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1317 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-17 M. Sean Finney + + * plugins/check_procs.c: set LC_NUMERIC to POSIX in check_procs.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1316 f882894a-f735-0410-b71e-b25c423dba1c + +2006-02-01 Ton Voon + + * plugins/t/check_mysql_query.t: If a mysql server has anonymous login, + tests will always fail + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1315 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/Makefile.am: Need to distribute perl test file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1314 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-31 Ton Voon + + * CHANGES: check_mysql_query included + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1313 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Note on MacOSX difference in mysql package + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1312 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am: Clean compile of check_mysql_query + on MacOSX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1311 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm: Sort ordering of tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1310 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/.cvsignore, plugins/Makefile.am, + plugins/check_mysql_query.c, plugins/t/check_mysql_query.t, + plugins/utils.h: Adding check_mysql_query, using new ranges and + threshold checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1309 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_mysql.t: Extra explanation in tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1308 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/tests/test_utils.c: Fixed invalid free + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1307 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated instructions on using libtap as + configure option changed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1306 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Changed configure option to --with-libtap-srcdir because + requires + tap.h as well as tap.o + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1305 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-30 Ton Voon + + * doc/developer-guidelines.sgml, plugins/tests/test_utils.c, + plugins/utils.c, plugins/utils.h: Clearly defined thresholds & ranges in + docs. Added get_status routine. Added + set_thresholds routine. Tests enhanced to check new routines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1304 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, doc/developer-guidelines.sgml, plugins/Makefile.am, + plugins/tests/.cvsignore, plugins/tests/Makefile.am, + plugins/tests/README, plugins/tests/check_disk, plugins/tests/check_dns, + plugins/tests/check_ftp, plugins/tests/check_hpjd, + plugins/tests/check_http, plugins/tests/check_load, + plugins/tests/check_ping, plugins/tests/check_procs, + plugins/tests/check_swap, plugins/tests/check_users, + plugins/tests/check_vsz, plugins/tests/test_utils.c, + plugins/tests/test_utils.t, plugins/utils.c, plugins/utils.h: Added + libtap tests for utils.c library functions. Removed redundant + test files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1303 f882894a-f735-0410-b71e-b25c423dba1c + +2006-01-21 Ton Voon + + * tools/sfsnapshot: Have to use own id for cvs checkout. Change compile + server because + old one not working consistently + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1302 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-19 Ton Voon + + * NPTest.pm: Break out of testing if a new parameter is required + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1301 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-16 Harper Mann + + * contrib/check_log2.pl: Added ability to output critical on error. + Fixed open so it properly fails if the log file open throws an error, + turned on -w in the perl call, fixed warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1300 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-15 Ton Voon + + * NPTest.pm, plugins/check_mysql.c, plugins/t/check_mysql.t: Display + errors with slave queries correctly. Added extra tests for slaves + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1299 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, doc/developer-guidelines.sgml, plugins/t/check_disk.t: New + 3 parameter version of getTestParameters. Updated check_disk.t to + reflect. + Added notes re: testing in developer guidelines. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1298 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl, plugins-scripts/t/check_file_age.t: + Allow directories and links to be tested by check_file_age. Sanitise + output. + Added tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1297 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-07 Harper Mann + + * plugins/urlize.c: Nagiosplug bug 1266977. Added code to insert the + closing after the plugin output but before the performance output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1296 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-07 Ton Voon + + * THANKS.in, plugins/common.h: No floorf on Solaris 9 (Jon Vandegrift - + 1374705) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1295 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-02 Ton Voon + + * THANKS.in, doc/developer-guidelines.sgml, plugins/check_nagios.c, + plugins/t/check_nagios.nagios1.status.log, + plugins/t/check_nagios.nagios2.status.dat, plugins/t/check_nagios.t: + Support for Nagios 1 and Nagios 2 status files (Gerhard Lausser - + 1296242) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1294 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/.cvsignore: Ignore temporary files created for tests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1293 f882894a-f735-0410-b71e-b25c423dba1c + +2005-12-01 Ton Voon + + * config_test/Makefile, config_test/run_tests, configure.in: Run longer + test on redhat for spopen/pthread problem. Allow enable/disable of + pthread fix via configure option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1292 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-30 Harper Mann + + * plugins-scripts/check_ntp.pl: Nagiosplug bug # 1251096 + check_ntp wasn't properly handing a bad exit status from the external programs it calls (ntpdate and ntpq), so jitter wasn't set. Added check of $? on close and proper error output if status from the sub program call completion is non-zero. This includes "host not found". + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1291 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-29 Harper Mann + + * contrib/check_email_loop.pl: UNKNOWN exit status was returning status + of "-1", changed to "3" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1290 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_email_loop.pl: Bug: 1355304 Added patch for ePN and perl + warnings. Fixed some text and + a warning about type comparison. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1289 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-18 Ton Voon + + * tools/sfsnapshot: Create a permanent link to HEAD snapshot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1288 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated with more detailed description + of UNKNOWN states + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1287 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-16 Ton Voon + + * plugins/check_disk.c: Fixed some compile errors with new translations. + Also reintroduced formatting + after discussion with Benoit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1286 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-15 Ton Voon + + * plugins/t/check_disk.t: Updated tests to minimise false positives. + Breaking down so more obvious + what the tests are doing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1285 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-14 Ton Voon + + * doc/developer-guidelines.sgml: Added section re: translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1284 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-14 Benoit Mortier + + * plugins/check_http.c: localization cleaning ... + last commit before sleeping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1283 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c: + start of the cleaning of the localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1282 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-12 Ton Voon + + * THANKS.in, plugins/t/check_disk.t: Updated check_disk tests to use + Test::More (Serhan Kiymaz) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1281 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-09 Ton Voon + + * plugins/t/check_mysql.t: Using Test::More + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1280 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/t/check_imap.t, plugins/t/check_swap.t: Added new + NPTest->testCmd which returns objects back for testing + at the test script level. Updated check_swap and check_imap to this + new format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1279 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Problem where absolute thresholds not working on + /proc/meminfo + systems. Suffixed all variables with the unit of measurement + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1278 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Typo with predetermined values + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1277 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added copyright/license info required + in submissions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1276 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/NEW_STARTERS, doc/developer-guidelines.sgml: Updated dev + guidelines to link to NagiosExchange. Removed project admin + notes from guidelines into separate file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1275 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-07 M. Sean Finney + + * configure.in: incorporated patch from Elan Ruusamäe (ahmake) to + override + program autodetection (see Feature Requests-1341528). i would + not call this quite complete just yet (i'll explain more in the + tracker), but should be functional and useful enough to commit + now, in any case. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1274 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-04 Ton Voon + + * THANKS.in, plugins/check_tcp.c, plugins/t/check_imap.t: Fixed + --mismatch option for check_tcp. Added tests into check_imap + (Rick Fey - 1339134) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1273 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-03 Ton Voon + + * Makefile.am, tools/tinderbox_build: Adding new tinderbox build script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1272 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_disk.t, plugins/t/check_procs.t: Invalid mount point + doesn't make sense because most df implementations + would work out the actual mount point. And fixed typo in check_procs.t + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1271 f882894a-f735-0410-b71e-b25c423dba1c + + * NPTest.pm, plugins/t/check_http.t, plugins/t/check_time.t: Fixing some + test failures + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1270 f882894a-f735-0410-b71e-b25c423dba1c + +2005-11-02 M. Sean Finney + + * plugins/check_disk.c: #995761: patch from ben o'hara to include inode + calculations in + check_disk.c. + + previous commit also had a patch for smtp auth support, but i accidentally + sent a blank commit message. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1269 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: check_smtp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1268 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-31 M. Sean Finney + + * configure.in, plugins/check_game.c, plugins/check_http.c, + plugins/check_nagios.c, plugins/check_snmp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/common.h, plugins/netutils.c, + plugins/netutils.h, plugins/sslutils.c: code cleanups, largely resulting + from turning on -Wall. mostly + unused variables and explicit casting issues, but there were a + couple gotchas in there too. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1267 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-30 M. Sean Finney + + * plugins/Makefile.am: turned on -Wall in plugins/Makefile.am via + AM_CFLAGS. shouldn't keep + our heads in the sand for potential errors, after all :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1266 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: another fix from alex: check for '/' in the + server_address before + trying to resolve it via is_host(). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1265 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: fixes for some bugs found in my merging of the + tcp socket patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1264 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-29 M. Sean Finney + + * plugins-scripts/check_log.sh: check_log fixes from Ade Rixon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1263 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: patch from nsturm: Makefile.am should have been + checking for check_ldap + instead of check_ldaps. the result was that check_ldaps was not being + created during the build process. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1262 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-25 M. Sean Finney + + * COPYING, configure.in, plugins/Makefile.am, plugins/check_tcp.c, + plugins/netutils.c, plugins/netutils.h, plugins/utils.h, po/de.po, + po/fr.po: - added code to allow check_tcp (via np_net_connect) work with + local + unix sockets. some testing would be welcome. based on idea from + Alex Samorukov. + - also introduced a check_clamd behavior in check_tcp. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1261 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-24 M. Sean Finney + + * plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_dns.c, plugins/check_game.c, plugins/check_nagios.c, + plugins/netutils.c, plugins/runcmd.c, plugins/utils.c, plugins/utils.h: + initial merging of ae's np_runcmd code into selected plugins. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1260 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-23 M. Sean Finney + + * configure.in: whoops, missed this one, same as last commit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1259 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/netutils.c, plugins/sslutils.c: - + compartmentalized ssl code into seperate sslutils.c + - ssl-related cleanups in configure.in, and now openssl/gnutls options + automatically disable each other. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1258 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-19 M. Sean Finney + + * plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/netutils.c, plugins/netutils.h: all plugins now using + centralized ssl functions in netutils.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1257 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: endif was a few lines off of where it should be + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1256 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am, plugins/Makefile.am, + plugins/check_http.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/common.h, plugins/netutils.c, plugins/netutils.h: - initial + attempt at consolidating ssl-related code into netutils.{c,h} + - added some #ifdefs to common.h and netutils.h to prevent multiple + inclusions (as netlibs now includes common.h) + - all ssl plugins (tcp/http/smtp) compile cleanly against gnutls, though + certificate checking still needs to be done. + - modified configure script so you can also explicitly say "without-gnutls" + too (otherwise if you disable openssl you have no way of disabling + gnutls too) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1255 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-18 M. Sean Finney + + * configure.in, plugins/check_tcp.c: initial "experimental" support for + gnutls. by default openssl is still + used if available, and gnutls is only used if openssl is not available + or explicitly disabled (--without-openssl). currently the only plugin + i've verified to work is check_tcp, but i had to disable cert checking. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1254 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-18 Ton Voon + + * README: Added license information to README with exemption for use of + OpenSSL + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1253 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-13 Ton Voon + + * configure.in: Run spopen tests for Redhat ES SMP (Hans Engelen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1252 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-13 M. Sean Finney + + * po/de.po: debian bts #313960: + - grammatical german fixes. i'm taking the reporter's word for it :) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1251 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: debian bts #268044: + - use a "less beastly" regex for parsing ntpq output. probably need + some more widespread testing on this one. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1250 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: debian bts #296278: + - it seems that when check_disk uses the "df" routines and is told to + check a non-mountpoint, it would check the filesystem on which the + directory was mounted (i.e. /var/log -> /var if no /var/log mount). + the system-call routines now do this too. might need a bit more + widespread testing, but looks good for me and i did it without + modifying any of the system-call-specific codeblocks. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1249 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: debian bts #307905: + - someone changed the cmdline syntax of check game without also + updating the usage/help function ;p + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1248 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: debian bts #300701: + - check_smb fix for freespace threshold parsing from the cmdline options. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1247 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: multiple fixes in check_smtp from debian (bts + #285554): + - fix for double free via SSL_CTX_free. looks like the previous author + knew this was a problem but didn't care enough to fix it ;p. + - use defines instead of const chars for SMTP strings. + - default to send our fqdn (via gethostbyname lookup on gethostname) + in the HELO string, as this is an RFC/SMTP requirement. overridable + via cmdline. + - use EHLO instead of HELO if using STARTTLS, as it is not SMTP but + ESMTP. + - verify the server supports STARTTLS before initializing it. + - always send QUIT before disconnecting when possible. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1246 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c: was this plugin even working? i don't think the + if/else logic + was doing what was intended. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1245 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: check mysql now reads [client] defaults from + my.cnf (debian bug #278817) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1244 f882894a-f735-0410-b71e-b25c423dba1c + +2005-10-06 M. Sean Finney + + * plugins/check_ups.c: fix for misreporting temperature in perfdata + output for check_ups + (debian bts id: #316534) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1243 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-root/Makefile.am: whoops. now using automake + conditionals to prevent attempted compiles + of pst3 on non solaris systems. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1242 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-25 M. Sean Finney + + * plugins-root/Makefile.am: added rules to Makefile.am for pst3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1241 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-24 M. Sean Finney + + * configure.in: a final change to hardcode the path for where plugins + are installed. + it's a very, very ugly hack... if anyone can think of a better way + to do it, i'm all ears. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1240 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-22 M. Sean Finney + + * configure.in: use test instead of '[ ... ]' in configure.in. the + check_procs/pst3 + situation is still not quite fixed. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1239 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in, configure.in, plugins-root/pst3.c: first version of bob + ingraham's pst3 to allow checking for longer + cmdline names than otherwise possible, by querying solaris kmem + directly (ps forcibly truncates). added requisite configure.in voodoo + and updated THANKS.in. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1238 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-22 Ton Voon + + * po/POTFILES.in: Mark moving of check_dhcp and check_icmp for + translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1237 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-21 Ton Voon + + * AUTHORS, THANKS.in: Updated with contributors and new team member + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1236 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: Reopen connections for each query (1296296 - + David Sullivan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1235 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dhcp.c, plugins/check_icmp.c: Moved into plugins-root/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1234 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS, CHANGES, Makefile.am, README, configure.in, + plugins-root/.cvsignore, plugins-root/Makefile.am, + plugins-root/check_dhcp.c, plugins-root/check_icmp.c, + plugins/Makefile.am: Separation of root setuid plugins into + plugins-root/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1233 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-20 Ton Voon + + * configure.in: Incorrect assignment of procppid in configure.in + (1296497 - Pascal Larisch) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1232 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/t/check_procs.t: Support for Tru64 for + check_procs + additional test cases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1231 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-19 Ton Voon + + * doc/RELEASING: Note to update version number before creating ChangeLog + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1230 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: For 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1228 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1227 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Reminders for news item and tag format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1226 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: Updated BUGS for 1.4.2 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1225 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1224 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-15 Ton Voon + + * plugins/t/check_ping.t: Added test to make sure hostname has to be + specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1223 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c, plugins/check_swap.c: - Cleanup minor compile + errors on Irix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1222 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-14 Ton Voon + + * plugins/check_ping.c: Using common message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1221 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Required hostname not flagging as an error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1220 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Some makes do not like blank lines after "\". + Fixed check_ldaps to only + generate if check_ldap was created (Chester Hosey) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1219 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: Fix to parsing of uptime (Ronald Tin - 1254656) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1218 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: - Removing typos + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1217 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-13 Ton Voon + + * plugins/check_ping.c: More diagnostic messages from check_ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1216 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-12 M. Sean Finney + + * plugins/check_ping.c: re-add a call to setlocale(LC_ALL, "") in + check_ping.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1215 f882894a-f735-0410-b71e-b25c423dba1c + +2005-09-12 Ton Voon + + * THANKS.in: For help in fixing Red Hat problem with ECHILD and waitpid + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1214 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, config_test/Makefile, config_test/child_test.c, + config_test/run_tests, configure.in, plugins/popen.c: ECHILD error at + waitpid on Red Hat systems (Peter Pramberger and + Sascha Runschke - 1250191) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1213 f882894a-f735-0410-b71e-b25c423dba1c + +2005-08-30 Ton Voon + + * plugins-scripts/subst.in: Better comments for what the substitutions + are doing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1212 f882894a-f735-0410-b71e-b25c423dba1c + +2005-08-01 Ton Voon + + * doc/BRANCHING: Move notes on branching away from RELEASING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1210 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS, ChangeLog, REQUIREMENTS, configure.in, package.def: For 1.4.1 + release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1209 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-25 Peter Bray + + * NPTest.pm: Change the environment variable NPTESTCACHE to NPTEST_CACHE + for consistancy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1208 f882894a-f735-0410-b71e-b25c423dba1c + + * Helper.pm, Makefile.am, NPTest.pm, configure.in, + plugins-scripts/t/check_rpc.t, plugins/t/check_disk.t, + plugins/t/check_dns.t, plugins/t/check_fping.t, plugins/t/check_ftp.t, + plugins/t/check_hpjd.t, plugins/t/check_http.t, plugins/t/check_imap.t, + plugins/t/check_load.t, plugins/t/check_mysql.t, plugins/t/check_ping.t, + plugins/t/check_pop.t, plugins/t/check_procs.t, plugins/t/check_smtp.t, + plugins/t/check_snmp.t, plugins/t/check_swap.t, plugins/t/check_tcp.t, + plugins/t/check_time.t, plugins/t/check_udp.t, plugins/t/check_users.t, + plugins/t/check_vsz.t, test.pl.in: [1185704] New Testing Infrastructure. + Complete rewrite of the original testing infrastructure and + all test cases (to use the new infrastructure) + See NPTest.pm and issue 1185704 for more details. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1207 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-20 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1206 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix parsing for netkit-ping and iputils-ping + (Christian G Warden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1205 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-11 Ton Voon + + * plugins/check_nwstat.c: Miscelleneous bug fixes (Gerd Mueller - + 1235879) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1204 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-09 Ton Voon + + * BRANCHES: Changed format (already!) for awk simplicity + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1203 f882894a-f735-0410-b71e-b25c423dba1c + + * BRANCHES: Master file to describe the current branches in CVS. Will be + used by + sfsnapshot to create the snapshot tarballs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1202 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-06 Ton Voon + + * configure.in: Removed ",", causing problems with MacOSX compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1201 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Updated help file to remove swap -s reference + (Sivakumar Nellurandi) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1200 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, THANKS.in: Sean Finney moved to main list of plugin + developers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1199 f882894a-f735-0410-b71e-b25c423dba1c + +2005-07-04 Benoit Mortier + + * contrib/tarballs/check_traffic-0.90b.tar.gz: replace the version of + check_traffic who was missing the plugin + by a good one + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1198 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-29 M. Sean Finney + + * plugins/runcmd.c, plugins/runcmd.h: initial versions of the runcmd + framework by andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1197 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: divide by 0 fix for check_swap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1196 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-28 M. Sean Finney + + * plugins/check_load.c: set LC_NUMERIC to POSIX in check_load (1164325) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1195 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_swap.c: scanf parsing + fix for check_swap from tracker id 1123292. now use floor(3) + to round down floating point numbers. requires -lm on many systems, + so support for testing for this was added to the configure.in and + automake template + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1194 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-27 M. Sean Finney + + * plugins/check_hpjd.c: fixes from richard brodie (tracker id 1216576) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1193 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-26 M. Sean Finney + + * contrib/check_dl_size.pl, contrib/check_ftpget.pl, + contrib/check_logins.c, contrib/check_mysql.c, contrib/check_mysql.pl, + contrib/check_mysqlslave.pl, contrib/check_nwstat.pl, + contrib/check_pop3.pl, contrib/check_procl.sh, contrib/check_procr.sh: + spring cleaning of contrib directory from andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1192 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/check_memory.tgz, contrib/tarballs/check_spread.tar, + contrib/tarballs/radius.tar.gz: removal of obsolete tarballs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1191 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: "asprintf madness" fix from andreas' patch to + np-d, minus the comments. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1190 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-05 M. Sean Finney + + * plugins/check_tcp.c: check_tcp code cleanup from andreas plus fix to + andreas' patch from sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1189 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-03 M. Sean Finney + + * plugins/check_procs.c: gcc 2.x fixes from edward + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1188 f882894a-f735-0410-b71e-b25c423dba1c + +2005-06-01 Subhendu Ghosh + + * plugins/check_snmp.c: only load mibs if needed or specified - patch + 1212395 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1187 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-28 M. Sean Finney + + * plugins/check_load.c: bugfixes to check_load thanks to andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1186 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-26 M. Sean Finney + + * plugins/check_mysql.c: fix for check_msyql so that it doesn't use + column numbers but the + names instead for determining slave status. thanks to james kingston. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1185 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-25 Subhendu Ghosh + + * plugins/check_time.c: 64bit sys support - 1185713 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1183 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: support for getnext - 1106430 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1182 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: RH9 pattern + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1181 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: perfdata patch - 1172539 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1180 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: new option for zero offset - 1159317 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1179 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: v2c support - 1155754 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1178 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-25 M. Sean Finney + + * configure.in, plugins/check_nagios.c, plugins/check_procs.c: fixes for + check_procs: + - added support for printing the pid in all the ps outputs + - don't use the proc name to ignore self, use the pid vs getpid(). + - initialize procetime to null string otherwise -vvv can have funny results + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1177 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: bah, + my_connect is taken by mysql. now calling it np_net_connect. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1176 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-24 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: patched bug id 1200030 - regex update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1175 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: patched bug id 1204636 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1174 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-24 M. Sean Finney + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: + optimizations and cleanup from andreas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1173 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-23 M. Sean Finney + + * nagios-plugins.spec.in: build fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1172 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-03 M. Sean Finney + + * plugins/check_ping.c: setlocale(LC_ALL, "") should be + setlocale(LC_NUMERIC, "C") to properly parse the output of ping. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1171 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: if check_tcp was called with -e but not -s, it + would hang in a call to my_recv. the + fix committed here adds on more piece of logic to the check to see if more data needs + to be read, avoiding the deadlock call. a better fix would be to not use these "voodoo" + heuristics and instead use poll() or select(), but that's quite a bit more complicated. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1170 f882894a-f735-0410-b71e-b25c423dba1c + +2005-05-01 M. Sean Finney + + * plugins/popen.c, plugins/popen.h: better error checking in spopen + signal handler (see 1107524) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1169 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: provide a --with-perl option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1168 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-29 Stanley Hopcroft + + * contrib/check_sybase: check_sybase 0.7 from Simon Bellman. Thx + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1167 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-19 M. Sean Finney + + * plugins-scripts/check_ntp.pl: regexp fix for check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1166 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: check for the -w flag for ping6 as well as ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1165 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-17 M. Sean Finney + + * plugins-scripts/check_disk_smb.pl: also change the --help output to + reflect that check_disk_smb defaults to empty passwords + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1164 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-16 M. Sean Finney + + * plugins-scripts/check_disk_smb.pl: patch to check_disk_smb to allow + empty passwords + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1163 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-14 M. Sean Finney + + * plugins-scripts/check_mailq.pl: check_mailq fix, don't be case + sensitive matching /^\s+Total\sRequests:\s(\d+)$/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1162 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: typographical fix in check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1161 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-11 M. Sean Finney + + * plugins/check_ssh.c: properly call close() on the ssh connection + before exiting. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1160 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_tcp.c: this should add support for + check_ssmtp, based on the 1.3.x patch in 1155562, + but fixed to follow how things are done in 1.4 (using strdup instead of + asprintf) and patching configure.in instead of configure. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1159 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-07 M. Sean Finney + + * plugins/check_smtp.c: in honor of joining up, my first bugfix. this + should resolve 1174070. + + note i don't have an exchange server to test this against, but it + does what the requester mentioned (slightly cleaner than the patch + attached in the tracker). + + it does, however, still work against my own postfix server :) + + sean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1158 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-05 Harper Mann + + * plugins/check_snmp.c: This is a first cut at adding performance data + to check_snmp. I wasn't sure + how to handle UOM so only values that return SNMP type Counter32: are labled + with "c". All other values have a blank UOM. I also left off warn, crit, + max and min values in the performance data until we come up with a way to + handle them. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1157 f882894a-f735-0410-b71e-b25c423dba1c + +2005-04-04 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1156 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Fix static buffer (Nikolay Sturm) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1155 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-18 Matthew Kent + + * plugins/check_mysql.c: Replication check support for 4.1.x from Gerrit + Beine + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1154 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-08 Ton Voon + + * plugins-scripts/check_ntp.pl: Added OS info for offset issue + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1149 f882894a-f735-0410-b71e-b25c423dba1c + +2005-03-04 Ton Voon + + * plugins-scripts/check_ntp.pl: Ignore extra check on offset 0.00000 + (John Warburton - 1150777) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1148 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_smtp.c, plugins/check_ups.c: Fixed + // comments (Steve Greenland - 1143836) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1146 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: Support for IPv6 (Merijn Evertse - + 1119917) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1145 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, package.def: Changed to next version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1144 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Notes on branching + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1143 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Missed check_disk addition to 1.4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1141 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-11 Stanley Hopcroft + + * plugins/Makefile.am: Fix for check_icmp build on Solaris from Andreas + Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1140 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Ton Voon + + * configure.in: For 1.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1138 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for 1.4 release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1137 f882894a-f735-0410-b71e-b25c423dba1c + + * BUGS: New file to note known bugs for major releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1136 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Reordering of items with most important announcements first + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1135 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Stanley Hopcroft + + * contrib/check_oracle_tbs: New version (1.1) from John Koyle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1134 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-04 Ton Voon + + * Makefile.am: BUGS file addition to release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1133 f882894a-f735-0410-b71e-b25c423dba1c + + * README: Cleanup and addition of reference to BUGS file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1132 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Updated with corrections. Added note to update BUGS + file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1131 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-03 Ton Voon + + * THANKS.in: Patch against check_log + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1130 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: Check for log file readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1129 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-02 Stanley Hopcroft + + * contrib/check_email_loop.pl: Add debug option from John Rouillard + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1128 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: try again to stop looping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1127 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide_smart.c: restructure main() to stop looping on -n + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1126 f882894a-f735-0410-b71e-b25c423dba1c + +2005-02-01 Stanley Hopcroft + + * contrib/check_traceroute-pure_perl.pl: Thank you to Myke Place for + check_traceroute-pure_perl.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1125 f882894a-f735-0410-b71e-b25c423dba1c + + * THANKS.in: Thank you for contributed plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1124 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: check_icmp added to libexec_PROGRAMS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1123 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: check_icmp no longer regarded as volatile; built by default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1122 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/linux.h: plugins/linux.h, vestigeal header required for prior + versions of check_icmp, no longer required. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1121 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Amendments for check_icmp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1120 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: hacks to partly support check_icmp.c (1.0). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1119 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_icmp.c: Revised check_icmp (1.0) from A Ericsson. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1118 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_asterisk.pl, contrib/check_email_loop.pl, + contrib/check_http-with-client-certificate.c, + contrib/tarballs/check_traffic-0.91b.tar.gz: New or revised plugin in + /contrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1117 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-28 Stanley Hopcroft + + * contrib/check_sybase: New version of Simon Bellwoods check_sybase + (0.4). Thank you. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1116 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-27 Stanley Hopcroft + + * contrib/check_traceroute.pl: Jon Meek's check_traceroute for Mon + hacked by YT for Nagios. Prob pretty weak + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1115 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_smart.pl: Candidate successor to + /plugins/check_ide_smart.c. Now in /contrib. NB there is another new + plugin with sim function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1114 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_fan_cpq_present, contrib/check_fan_fsc_present, + contrib/check_mysqlslave.pl, contrib/check_temp_cpq, + contrib/check_temp_fsc: New /contrib plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1113 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_arping.pl, contrib/check_cpqarray.c, + contrib/check_frontpage, contrib/check_logins.c, + contrib/check_oracle_tbs, contrib/check_pcpmetric.py, + contrib/check_pfstate: New /contrib plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1112 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES, THANKS.in, contrib/README.TXT, po/de.po, po/fr.po: 1 New + /contrib plugins + 2 Revised check_dhcp.c status in CHANGES + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1111 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-27 Harper Mann + + * plugins/Makefile.am: Added check_dhcp bask into libexec_PROGRAMS after + talking with Stanley. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1110 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-26 Ton Voon + + * THANKS.in: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1109 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: Convert tabs to spaces from dig's answer section + (Randy O'Meara - 1107651) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1108 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Add recommendation for check_procs on Mandrake systems + (Paulo Fessel - 1106849) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1107 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Stanley Hopcroft + + * plugins/check_ide_smart.c: Display usage if no argv (Reuben Farrelly) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1106 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Harper Mann + + * plugins/check_dhcp.c: Tracker:1109261 This was an alignment problem on + Solaris. Linux kernel fixes alignment so this was not seen there. Memcpy + takes care of proper alignment. Tested on RHEL V3 U3, RHEL V4, FreeBSD + 4.10 (Thanks Stanley!) and Solaris 9 with the GNU env. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1105 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-25 Stanley Hopcroft + + * plugins/check_ide_smart.c: Trivial text changes (print_help, + commentary & -n option) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1104 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_dhcp.c, contrib/tarballs/check_icmp-0.8.tar.gz: moved to + /plugins (core plugin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1103 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_cit.tgz: replaced by contrib/check_ica* (esp + check_ica_metaframe_pub_apps) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1102 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_citrix: Replaced by the check_ica* pair of plugins + (mainly check_ica_metaframe_pub_apps) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1101 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/packet_utils.pm: packet creation and dumping hacks used by + check_ica* and check_lotus + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1100 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_master_browser.pl: New plugin - checks that ICA + master browser is what it should be (important for firewalled dialup) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1099 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_metaframe_pub_apps.pl: Replacement (structured name + mainly) for check_citrix: check of ICA browse service + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1098 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ica_program_neigbourhood.pl: New plugin to check Citrix + Metaframe XP "Program Neighbourhood" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1097 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_lotus.pl: New plugin to check responsiveness of Louts + Notes (v5 at least) servers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1096 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-24 Stanley Hopcroft + + * plugins/Makefile.am: Removed check_dhcp and check_icmp from + libexec_PROGRAMS (ie dont build by defaut) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1095 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Notes about check_dhcp and check_icmp (no longer built by + default, use at own peril, volatile) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1094 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Stanley Hopcroft + + * configure.in: Set arch specifc preprocessor symbols in config.h. + TEMPORARY hack for check_dhcp.c [on FreeBSD 4: /check_dhcp -i fxp0 -> + DHCP ok: Received 1 DHCPOFFER(s), max lease time = 259200 sec. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1093 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Harper Mann + + * plugins/check_snmp.c: Tracker 1106378 fixed - The -t (timeout) arg was + not handled correctly when passed to the snmpget command. Added -e + --retries for the correct retries value to snmpcmd. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1092 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-21 Ton Voon + + * doc/developer-guidelines.sgml: Changing copyright to the Nagios + Plugins Development Team, rather than + individual names. Also, clarified use of ACKNOWLEDGEMENTS, THANKS.in and + AUTHORS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1091 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * plugins/check_http.c: Changed long argument --minmax to --pagesize and + updated help and usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1090 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Ton Voon + + * AUTHORS, Makefile.am, THANKS.in: The AUTHORS file now used for the + plugin team, with THANKS.in as the + contributors list. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1089 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * CHANGES: Added comment about check_http --pagesize and added max value + to page size check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1088 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Ton Voon + + * AUTHORS: Added Sean for bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1087 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-20 Harper Mann + + * plugins/check_http.c: Tracker 1099682 fix. Now getting the page size + from Content-Length in the header. Added max value to the -m switch so + can do "-m min:max". Retained "-m min" convention. Renamed long arg name + to --minmax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1086 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-19 Harper Mann + + * plugins/check_nt.c: In the CHECK_COUNTER block, there were several + strcats writing to unallocated + memory. Changed to asprintf. We're not freeing since plugin run is short. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1085 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-19 Ton Voon + + * plugins/check_swap.c: Fixed parsing of AIX lsps command (1093522) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1084 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-14 Ton Voon + + * AUTHORS: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1083 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed ssl configure problems on Solaris (Bug 1096091) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1081 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-13 Ton Voon + + * configure.in, plugins/check_swap.c: Use floats for holding memory + values to avoid different types on different + OSes. Seems to have a problem with the perf data for check_swap on Sol 2.6, + but not critical + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1080 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-05 Ton Voon + + * configure.in, package.def: Update version number to next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1079 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-04 Benoit Mortier + + * plugins/check_ide_smart.c: still trying to fix #1094326 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1078 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-03 Benoit Mortier + + * plugins/check_ide_smart.c: more fixes for #1094326 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1077 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: fixes for #1094324 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1076 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-02 Benoit Mortier + + * plugins/check_ide_smart.c: fixing bug #1094326 + + still need to check the makefile for check_ide_smart.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1075 f882894a-f735-0410-b71e-b25c423dba1c + +2005-01-01 Ton Voon + + * plugins/check_smtp.c: Removed old terminate function (Bug 1093491) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1074 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-30 Ton Voon + + * ChangeLog: Updated with r1_4-beta1 details + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1072 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: Note some syntax changes to check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1071 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Update package files for version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1070 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: For help with ps on FreeBSD 4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1069 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Get ps command for FreeBSD 4 (Tomasz Pilat) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1068 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-30 Benoit Mortier + + * plugins/check_dhcp.c, plugins/check_dns.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_swap.c, plugins/check_tcp.c, po/de.po, po/fr.po, + po/nagios-plugins.pot: more internationalization fixes + internationalization freeze for beta1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1067 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-28 Benoit Mortier + + * AUTHORS, po/fr.po: more internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1066 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_smtp.c, po/fr.po: starttls support + for check_smtp #1041576 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1065 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_ping.c: String match in check_ping for Solaris + 10 #1091043 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1064 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-28 Ton Voon + + * configure.in: sys/param.h needed for sys/swap.h on openbsd 3.6 (Julien + Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1063 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-27 Benoit Mortier + + * po/fr.po: more internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1062 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-25 Benoit Mortier + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_icmp.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/netutils.c, plugins/popen.c, plugins/popen.h, plugins/urlize.c, + plugins/utils.c, po/de.po, po/fr.po, po/nagios-plugins.pot: various + fixes for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1061 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po, po/nagios-plugins.pot: new version of po files and + pot file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1060 f882894a-f735-0410-b71e-b25c423dba1c + + * package.def, po/POTFILES.in: change realase name on package.def + adding check_dhcp.c to potfiles.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1059 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dhcp.c: internationalization of + check_dhcp + internationalization fixes of check_ssh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1058 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-24 Benoit Mortier + + * plugins/check_icmp.c, po/POTFILES.in, po/fr.po: first pass at adapting + to plugin guidelines + and start of localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1057 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Benoit Mortier + + * plugins/check_http.c, po/fr.po: internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1056 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Michael Wirtgen + + * po/de.po: german translations 391 to go + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1055 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-23 Ton Voon + + * ACKNOWLEDGEMENTS, configure.in, m4/np_curl.m4, plugins/Makefile.am: + Another attempt at fixing check_http compile on Redhat EL3. Fixed + check_icmp + compile (Lynne Lawrence - 1087171) - still some code changes to check_icmp + outstanding. Fixed compile of check_dhcp (complaining about socklen_t). + Added acknowledgements for Coreutils and curl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1054 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-22 Harper Mann + + * plugins/check_nt.c: Added check for "%" in COUNTER . If + it exists, is used as an arg to asprintf. If it doesn't + exist, is used as a label. If the formatting is wrong, the + program will segv. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1053 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-22 Ton Voon + + * lib/Makefile.am, lib/stdbool_.h: File required from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1052 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Ton Voon + + * configure.in, plugins/Makefile.am: Revert back to previous openssl + checks (the ones from curl kept having + problems with later Redhat versions) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1051 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/stdbool.m4: Another m4 from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1050 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: For their bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1049 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, m4/Makefile.am, m4/np_coreutils.m4: Fixed compile + problem on Sol2.6 with stdbool.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1047 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Stanley Hopcroft + + * plugins/check_dhcp.c: Commentary changes only: cite origin of copied + code with reference to ACK file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1046 f882894a-f735-0410-b71e-b25c423dba1c + + * ACKNOWLEDGEMENTS: ACK file contains the details of the authors of code + copied by the plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1045 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-21 Matthew Kent + + * plugins/check_dns.c: Add another error string match from Pasi + Tiittanen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1044 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-20 Ton Voon + + * plugins/check_nagios.c: Corrected help for expiry units. Restored + functionality of searching for + process arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1043 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Updating help text to reflect using shortname + instead of full path for command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1042 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: - stupid typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1041 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fix compile errors when looking for openssl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1040 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-20 Stanley Hopcroft + + * COPYING, plugins/check_dhcp.c, po/de.po, po/fr.po: Compilation fixes + for check_dhcp.c HP-UX 11. Still fails on HP-UX 10. Unknown if + check_dhcp works on UX. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1039 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-18 Michael Wirtgen + + * po/de.po: Initial commit on german translation - 428 to go + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1038 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-17 Ton Voon + + * configure.in: Support for FreeBSD 5.2.1 and 5.3 in check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1037 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-15 Ton Voon + + * configure.in: Bump version to next release + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1036 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Mistake in automake version - back to + 1.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1035 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/RELEASING: Clarified notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1034 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for r1_4_0-alpha3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1032 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated requirements for GNU tools + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1031 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/Makefile.am: Makefile for m4 files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1030 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in, plugins/Makefile.am, tools/setup: Support + for coreutils lib. Configure tests via m4 scripts from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1029 f882894a-f735-0410-b71e-b25c423dba1c + + * m4/Makefile.am.in, m4/afs.m4, m4/codeset.m4, m4/error.m4, + m4/exitfail.m4, m4/extensions.m4, m4/fstypename.m4, m4/fsusage.m4, + m4/getopt.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/intdiv0.m4, + m4/inttypes-pri.m4, m4/inttypes.m4, m4/inttypes_h.m4, m4/isc-posix.m4, + m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, + m4/ls-mntd-fs.m4, m4/malloc.m4, m4/mountlist.m4, m4/np_coreutils.m4, + m4/onceonly.m4, m4/progtest.m4, m4/realloc.m4, m4/stdint_h.m4, + m4/uintmax_t.m4, m4/ulonglong.m4, m4/unlocked-io.m4, m4/xalloc.m4: + Moving m4 files from lib/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1028 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/afs.m4, lib/error.m4, lib/exitfail.m4, + lib/fstypename.m4, lib/fsusage.m4, lib/full-read.c, lib/full-write.c, + lib/full-write.h, lib/getopt.m4, lib/ls-mntd-fs.m4, lib/onceonly.m4, + lib/safe-read.c, lib/safe-read.h, lib/safe-write.c, lib/safe-write.h, + lib/unlocked-io.m4, lib/xalloc.m4: Moving m4 files into m4/. Added extra + coreutils files required from + autoconf tests. Updated Makefile.am to have nagiosplug lib and a separate + coreutils lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1027 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-15 Benoit Mortier + + * po/de.po, po/fr.po: fr.po work in progress still 88 to translate ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1026 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-11 Matthew Kent + + * plugins/check_tcp.c: Patch from Ollie Cook to define return code when + expected value not received (#1082275). + Also included another change from Ollie Cook to do stricter matching of expected values from the beginning of the line. When a user defines an expected string this is changed to the old style strstr matching. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1025 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Ton Voon + + * plugins/check_ldap.c: Fixed compile warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1024 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Matthew Kent + + * plugins/Makefile.am: Compile broken - fixing link flags. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1023 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Error catching improvements from Ollie Cook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1022 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: Fixing broken compile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1021 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: More contributers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1020 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Stanley Hopcroft + + * plugins/Makefile.am: Changes to link flags for check_dhcp.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1019 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dhcp.c: Extensive changes to get MAC address from + Solaris via DLPI + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1018 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-10 Ton Voon + + * plugins/check_dns.c, plugins/check_procs.c: Reverting back ngettext + calls + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1017 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: Fix includes for gettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1016 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-09 Ton Voon + + * configure.in: Include $libsuff for systems that define this (based on + advice from + Daniel Stenberg) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1015 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Ton Voon + + * configure.in: Removed redundant check and make export LD_LIBRARY_PATH + more sh friendly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1014 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Benoit Mortier + + * configure.in, plugins/Makefile.am, plugins/check_by_ssh.c, + plugins/check_game.c, plugins/check_http.c, plugins/check_ide_smart.c, + plugins/check_ldap.c, plugins/check_snmp.c, plugins/check_tcp.c: patch + 1028033 + + minor internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1013 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-08 Ton Voon + + * configure.in: Fixed output info for openssl and LD_LIBRARY_PATH for + subsequent compiles + (otherwise get ld.so.1: ./conftest: fatal: libssl.so.0.9.7: open failed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1012 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Ton Voon + + * configure.in, plugins/Makefile.am: Better SSL checking (inspired by + curl 7.12.2's configure.ac) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1011 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Matthew Kent + + * plugins-scripts/check_ifoperstatus.pl: Option to check for admin down + (#1012191) from Raúl Pedroche. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1010 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-07 Stanley Hopcroft + + * plugins/Makefile.am: Correct dependencies for check_dhcp.c. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1009 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_dhcp.c: New plugin: check_dhcp.c. + Attempt to port to non Linux platform. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1008 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-06 Benoit Mortier + + * po/fr.po: new version of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1007 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-05 Matthew Kent + + * plugins/check_snmp.c: Fix for -s string matching (#756567, Tony + Missana) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1006 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-05 Benoit Mortier + + * plugins/check_nt.c, po/fr.po, po/nagios-plugins.pot: cleaned fr.po + nagios-plugins.pot + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1005 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_icmp.c, plugins/check_nwstat.c, + plugins/check_ping.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/utils.h: fix patch 998291 + fix patch 1078934 expect check_ssh fix and check_nt perfdata should stay + on one word like in nagios + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1004 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-04 Benoit Mortier + + * po/nagios-plugins.pot: new version of pot file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1003 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dns.c, po/POTFILES.in: various + internationalization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1002 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_by_ssh.c, plugins/check_dig.c, + plugins/check_http.c, plugins/check_ide_smart.c, plugins/check_mrtg.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + po/POTFILES.in: internationalization fixes + bugfixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1001 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/check_hpjd.c: check_dns needs a space + between 'time' and the hostname + check_hpjd needs a parenthesis removed in print_usage() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1000 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Bug Fix [ 1024735 ] check_swap providing + inaccurate swap information on Sol6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@999 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c: reverting my changes from + !=TRUE to == ERROR, that's not good ;-( sorry + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@998 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, po/de.po, po/fr.po, po/nagios-plugins.pot: + check_tcp parenthesis bug, header fix for po files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@997 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ide-smart.c, + plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c: + print_help and print_usage() cleanup + + other misc cleanups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@996 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Stanley Hopcroft + + * plugins/check_tcp.c: 1041571: -D option processing corrected (Eric + Chen). Changed process_arguments() to return TRUE. Dont know why this + was necessary. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@995 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c, plugins/urlize.c: remove UT_HLP_VRS from print_usage + this was not a good idea ;-) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@994 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: removing support fonction + removing warranty from print_revision + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@993 f882894a-f735-0410-b71e-b25c423dba1c + + * ROADMAP, package.def, plugins/negate.c, plugins/utils.h: some minor + fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@992 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c, plugins/check_ssh.c: correcting parenthesis + error + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@991 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_load.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/urlize.c: fixes for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@990 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c: + internationalization fixes and help fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@989 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_http.c, + plugins/check_nwstat.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_udp.c, po/.cvsignore: Localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@988 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ide-smart.c, plugins/check_pgsql.c: correcting copyright + and remaning int result = STATE_UNKNOWN; + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@987 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Matthew Kent + + * plugins/check_nagios.c: Affected by elapsed time patch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@986 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Another contributer. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@985 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_procs.c: Patch from Russell Miller which + adds elapsed time as a metric. Only for linux so far. (991359) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@984 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: Fix typo breaking compile. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@983 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-03 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_dns.c, + plugins/check_dummy.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/urlize.c: bump + copyright year + initialize result to STATE_UNKNOW in place of STATE_OK + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@982 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_dns.c, plugins/check_ldap.c, plugins/check_procs.c: + --disable-nls throws an error on check_dns, check_procs and + check_ldap without this patch. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@981 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Stanley Hopcroft + + * plugins/check_tcp.c: Tracker 1041571: appended :D to getopt_long() + args (for cert expiry check). Eric Chen. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@980 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/utils.c: More internationalization work + new usage4 function to permit localisation of think like check_ssh: xxxxx + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@979 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/negate.c: return of process_arguments() is TRUE not OK ! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@978 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: return of process_arguments() is TRUE not OK ! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@977 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Stanley Hopcroft + + * plugins/Makefile.am: Add check_icmp plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@976 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_icmp.c: check_icmp plugin from A Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@975 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/linux.h: For check_icmp plugin from A Ericsson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@974 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Matthew Kent + + * command.cfg.in: Fix typo. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@973 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, REQUIREMENTS, command.cfg.in, plugins/check_ups.c: Patch from + Arnaud Quette to bring support to NUT 2.0 plus couple improvements and + fixes (1038413 which includes 1032009, 815785). + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@972 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-02 Benoit Mortier + + * plugins/check_dns.c, plugins/check_game.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_load.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/negate.c, + plugins/popen.c: changed Error: by CRITICAL - + more localization fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@971 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_rbl.c: adapted for localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@970 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_nagios.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/common.h, plugins/getaddrinfo.c, plugins/getaddrinfo.h, + plugins/gethostbyname.c, plugins/gethostbyname.h, plugins/negate.c, + plugins/netutils.c, plugins/netutils.h, plugins/popen.c, + plugins/urlize.c, plugins/utils.c, plugins/utils.h: standardize + localization string + standardize unknow arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@969 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Ton Voon + + * doc/RELEASING: Notes on releasing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@968 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Next version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@967 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: Updated for r1_4_0-alpha2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@965 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/devmode: eval not working - instructions now in comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@964 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Fixed pmon process checking from a + change I made earlier + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@963 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Benoit Mortier + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_ssh.c: first + pass at standardization of messages for the localization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@962 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Stanley Hopcroft + + * configure.in: Bryan Loniewski contributed check_jabber plugin + (SSL/check_tcp); Eric Chen check_nntps plugin + SSL certficate expiry + check [added -D option to check_tcp] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@961 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c: 1075725: patch to my_connect() to deal with SEGV + if connect fails + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@960 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: 1041571 & 664615: check_tcp with cert check + + nntps, simap, jabber + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@959 f882894a-f735-0410-b71e-b25c423dba1c + +2004-12-01 Matthew Kent + + * contrib/check_nmap.py: Small fix from David Rippel (996800) for newer + versions of nmap + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@958 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Perf data and other improvements by + Florian Gleixner (1027787) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@957 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Benoit Mortier + + * po/fr.po: more french translations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@956 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Ton Voon + + * plugins/check_ide-smart.c: Capitalized some error messages + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@955 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/urlize.c: Updated output to UNKNOWN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@954 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-30 Benoit Mortier + + * po/fr.po: translating fr.po new part + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@953 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Ton Voon + + * lib/Makefile.am, lib/exitfail.m4, lib/getopt.m4: Extra files required + from coreutils + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@952 f882894a-f735-0410-b71e-b25c423dba1c + + * SUPPORT: Cleanup and statement re: contrib plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@951 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Patches for configure on *BSD (Julien Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@950 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Stanley Hopcroft + + * contrib/README.TXT, contrib/rblcheck-dns, contrib/rblcheck-web, + contrib/tarballs/check_icmp-0.8.tar.gz: *** empty log message *** + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@949 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Matthew Kent + + * contrib/check_linux_raid.pl: Better error checking (820806) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@948 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-29 Benoit Mortier + + * po/fr.po: second version of french .po still 300 ;-) to translate + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@947 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-28 Benoit Mortier + + * po/fr.po: first new translation of fr.po + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@946 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-27 Matthew Kent + + * plugins/check_ssh.c: Add remote version check (1030269, Daniel Gullin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@945 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-26 Stanley Hopcroft + + * AUTHORS: New plugin/bugfix: tracker 1070929. check_hpjdres + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@944 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-25 Matthew Kent + + * plugins/check_disk.c: From old test harness code, make ./check_disk -w + 0 -c 0 / valid parameters again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@943 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_dns.t, plugins/t/check_http.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, test.pl.in: Updating test harness + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@942 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-25 Stanley Hopcroft + + * contrib/README.TXT: Removed reference to non existent tar balls + (Hopcroft plugins) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@941 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_wins.pl: Non functional tidy ups to check_wins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@940 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_hw.sh: Added /contrib/check_hw.sh by Rok Debevc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@939 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_sybase: Added /contrib/check_sybase by Simon Bellwood + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@938 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_hprsc.pl: update check_hprsc.pl for Net-SNMP versions + >=4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@937 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Ton Voon + + * tools/sfsnapshot: Removing build directory after creating distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@936 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Added clean + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@935 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Stanley Hopcroft + + * plugins/check_hpjd.c: add -OQa to command_line in check_hpjd.c. + Correct nagiosplug-Bugs-889948, 846329 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@933 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Matthew Kent + + * plugins/check_nwstat.c: Attempting to fix a reported segfault + (1055054) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@932 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Added support for sending port in host header + (913633) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@931 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-24 Ton Voon + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/urlize.c: Making messages more consistent + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@930 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Ton Voon + + * plugins/check_by_ssh.c, plugins/check_dns.c, plugins/check_hpjd.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_mysql.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_swap.c, + plugins/check_time.c: Standardising translation texts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@929 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Guidelines on translated text (Yves + Mettier, Simon Bellwood, Andreas Ericsson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@928 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Adding notes on developer and + translator access in SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@927 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Matthew Kent + + * AUTHORS: More contributers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@926 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fix integer warning and critical options. Take + values from current unit instead of always KB. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@925 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-23 Stanley Hopcroft + + * doc/developer-guidelines.sgml: trivial changes to Perl plugin section. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@924 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-22 Ton Voon + + * AUTHORS: More contributors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@923 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Fixed some messages that should not be translated + (Benoit Mortier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@922 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-21 Matthew Kent + + * plugins/check_mysql.c: Patch from Nathan Shafer to add replication + slave check (1006777) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@920 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-20 Matthew Kent + + * AUTHORS: Oops, forgot one. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@919 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: More contributers. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@918 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_linux_raid.pl: Fix always reading status from the last + line (1045506) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@917 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: New output format reported by pumuckel1980 + (946857) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@916 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Bit of cleanup, fix verbose output. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@915 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-20 Ton Voon + + * configure.in: Fixed va_copy problem on AIX by copying samba's + configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@914 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Ton Voon + + * CODING: Added perl coding guidelines, from Programming Perl book + (Andreas Ericsson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@913 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/getloadavg.m4: I think getloadavg.m4 is no longer required (as + autoconf has built-in function) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@912 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: Removed getloadavg.m4 (built-in function in autoconf) + and added cloexec.[hc] + for getloadavg.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@911 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/cloexec.c, lib/cloexec.h: Files required for getloadavg.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@910 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Matthew Kent + + * plugins-scripts/check_ntp.pl: Fix incorrectly labelled units in output + (1025905, Jason Martin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@909 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Enabling timeout flag (1010097, Jason Martin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@908 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Make -L notice ssl use to output a proper href + (1035234, Abid Rasheed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@907 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Change unit from 'us' to 's' to match other core + plugins for simplicity. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@906 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-19 Ton Voon + + * AUTHORS: - More great contributors... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@905 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Options for User Agent string and extra headers + (Ibere Tizio) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@904 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Ton Voon + + * configure.in: Remove unnecessary CPPFLAGS for openssl (Lutz Behnke - + 686476) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@903 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Enhance SSL initialization problems (Phil + Dibowitz - 1055120) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@902 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Matthew Kent + + * plugins/check_smtp.c: Go critical on no route to host instead of + warning (934025) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@901 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-18 Ton Voon + + * tools/setup: Use copy of tools for consistency if building on + different platforms from + shared source + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@900 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-17 Ton Voon + + * plugins/check_tcp.c: Ignore output from tcp port (949070 - Jan-Piet + Mens) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@899 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: --no-body and --max-age options (949521 - Jamie + Zawinski) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@898 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added section on using Sourceforge, + mainly for administrators + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@897 f882894a-f735-0410-b71e-b25c423dba1c + +2004-11-12 Ton Voon + + * tools/update_coreutils: Tool to pull newer coreutil libs into + nagiosplug's lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@896 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, lib/exit.h, + lib/exitfail.c, lib/exitfail.h, lib/fsusage.c, lib/fsusage.h, + lib/fsusage.m4, lib/full-read.h, lib/getloadavg.c, lib/getopt.c, + lib/getopt.h, lib/getopt1.c, lib/gettext.h, lib/ls-mntd-fs.m4, + lib/malloc.c, lib/mountlist.c, lib/mountlist.h, lib/onceonly.m4, + lib/realloc.c, lib/snprintf.c, lib/strtod.c, lib/unlocked-io.h, + lib/unlocked-io.m4, lib/xalloc.h, lib/xalloc.m4, lib/xmalloc.c, + lib/xstrdup.c, plugins/check_disk.c, po/de.po, po/fr.po: Update to using + coreutils 5.2.1 libraries and snprintf.c from samba 3.0.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@895 f882894a-f735-0410-b71e-b25c423dba1c + +2004-09-07 Ton Voon + + * doc/developer-guidelines.sgml: Clarity based on comments by Ben + Clewett + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@894 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-23 Ton Voon + + * AUTHORS: For patch to check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@893 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Restore divisor for memory size reported by + Windows. Also, implements warning + and critical levels for performance counters. (Paulo Afonso Graner Fessel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@892 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c, plugins/common.h: Using swapctl + for Solaris, Tru64 and *BSD (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@891 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-19 Ton Voon + + * configure.in, plugins/check_swap.c, plugins/common.h: Patch for tru64 + using swapctl calls (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@890 f882894a-f735-0410-b71e-b25c423dba1c + +2004-08-18 Ton Voon + + * AUTHORS: Another day's work... + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@889 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: Checks different record types and checks against + an expected address (Bill Kunkel) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@888 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Support for check_swap on NetBSD/OpenBSD (Sean Finney) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@887 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: More specific test for sid (Paul + Allen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@886 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Fixed perfdata so that shows amount used (Garry + Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@885 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: Perfdata corrected (Garry Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@884 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Fix for similar dataabase sids + (Carole Verdon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@883 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Gary Cook for perfdata for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@882 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Perfdata added (Gary Cook) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@881 f882894a-f735-0410-b71e-b25c423dba1c + +2004-06-26 Ton Voon + + * tools/sfsnapshot: Change of compile server and cleanups + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@880 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Remove need to alter configure.in. Using different + compile farms for + SF to do the compiling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@879 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-24 Ton Voon + + * AUTHORS: Ben Clewett + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@878 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: Missed getloadavg.c (Ben Clewett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@877 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-20 Ethan Galstad + + * contrib/check_dhcp.c: DHCP bug fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@876 f882894a-f735-0410-b71e-b25c423dba1c + +2004-05-10 Ton Voon + + * configure.in: Set EXTRAS with check_swap if ac_cv_have_swap is set + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@875 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-30 Ton Voon + + * configure.in: ps -el for HP-UX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@874 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-29 Ton Voon + + * configure.in: Bug in ps -el for AIX 4.1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@873 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Sven for HP-UX requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@872 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: HP-UX requirements (Sven Schaffranneck) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@871 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-19 Subhendu Ghosh + + * AUTHORS, contrib/check_nagios_db_pg.pl: Postgres backend monitor + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@870 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins-scripts/check_mssql.pl: check_mssql.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@869 f882894a-f735-0410-b71e-b25c423dba1c + + * README: Win32 plugin repository + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@868 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-08 Ton Voon + + * AUTHORS: Torsten Werner for check_racle patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@867 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Cleaner calls to awk and support if + Oracle has different national + language settings (Torsten Werner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@866 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-06 Ton Voon + + * configure.in, plugins/check_procs.c: Fixed weird scanf bug on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@864 f882894a-f735-0410-b71e-b25c423dba1c + +2004-04-02 Karl DeBisschop + + * plugins/check_by_ssh.c: add example invocation to help + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@863 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-31 Ton Voon + + * AUTHORS: Howard Wilkinson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@862 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Command line argument bug (Howard Wilkinson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@861 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c: Set default state (Howard Wilkinson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@860 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Update author list + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@859 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-23 Karl DeBisschop + + * plugins/check_fping.c: check was supposed to be agains ms - got munged + wfixeg the perfdata output to be in seconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@858 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-22 Ton Voon + + * AUTHORS: Joe Rhett for getopt bug + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@856 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Option --url not mapped (Joe Rhett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@855 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-18 Ton Voon + + * AUTHORS: More help for patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@854 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Typo in check_disk units (Matthew Kent - 909281) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@853 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Mysql include path not added correctly (Arnold Cavazos - + 912974) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@852 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c: Option to fill in NAS-identifier to Emulate + pam_radius behaviour (Alexander Kulak) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@851 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-17 Ton Voon + + * doc/developer-guidelines.sgml: Copyright information for patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@850 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-14 Karl DeBisschop + + * plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtgtraf.c, + plugins/check_pgsql.c, plugins/check_smtp.c, plugins/check_tcp.c, + plugins/check_ups.c: use fperfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@849 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: use fperfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@848 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-12 Ethan Galstad + + * contrib/check_cluster2.c: New cluster plugin for Nagios 2.x + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@847 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-11 Ton Voon + + * CHANGES: check_procs difference + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@846 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Incorporate check_proc changes into + check_nagios. ps handling probably should + be moved into utils.c in future + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@845 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-08 Ton Voon + + * configure.in: Require ngettext + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@844 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Information on plugin output format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@843 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-04 Karl DeBisschop + + * plugins/check_dig.c, plugins/check_dns.c, plugins/check_game.c: use + float for time in perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@842 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-03 Karl DeBisschop + + * plugins/check_http.c, plugins/utils.c: begin writing some perfdata as + float + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@841 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_pop3.pl: fix loop and \r\n (Jason Burnett - + http://sourceforge.net/tracker/index.php?func=detail&aid=895677&group_id=29880&atid=397599) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@840 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: check_disk was getting blocks instead of bytes + (Michael Musikhin - + http://sourceforge.net/tracker/index.php?func=detail&aid=900215&group_id=29880&atid=397599) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@839 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-02 Karl DeBisschop + + * pkg/fedora/requires, pkg/redhat/requires: attempt to prune requires + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@838 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, nagios-plugins.spec.in, pkg/fedora/requires: make + specfile into a template which can generate a generic spec plus specs + suitable for various repositories + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@837 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: prpare for alpha2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@836 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: relax check for -w/-c to accept floats (bug + report from Warrick FitzGerald) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@835 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_swap.c: fix div by zero error when swaptotal is + zero (Flo Gleixner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@834 f882894a-f735-0410-b71e-b25c423dba1c + +2004-03-01 Karl DeBisschop + + * plugins/check_tcp.c, plugins/netutils.c: check_tcp was returning + uninitialized string with user-defined refused outcome + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@833 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: allow regex for ecpect checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@832 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-29 Karl DeBisschop + + * plugins/check_nwstat.c, plugins/netutils.c, plugins/netutils.h: was + making up to 34 separate tcp connections - now we open one and reuse + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@831 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-28 Karl DeBisschop + + * plugins/check_snmp.c: checks for warn in check_num() mistakenly + referred to crit limits + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@830 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: minor doco update to reflect handling of + repeated caoomand strings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@829 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: work in progress to accept multiple + command/expect pairs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@828 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: update to work with Linux 2.6 /proc/meminfo + format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@827 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-25 Karl DeBisschop + + * AUTHORS, plugins/check_dns.c: check server for authoritative status + (from Jon Hallet) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@826 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: change some datatypes to llu for very large + swaps + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@825 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_ping.c: pass timeout to ping if supported + with -w parameter (linux) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@824 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-21 Karl DeBisschop + + * plugins/check_by_ssh.c: add option to ignore a specified number of + lines on stderr + (to suppress a login banner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@823 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Add Jason Martin for report of missing $opt_C for 'use vars' + in check_breeze + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@821 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_breeze.pl: add opt_C to 'usr vars' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@820 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Ton Voon + + * plugins/check_http.c: - Missed out getopt for -T + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@819 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Karl DeBisschop + + * contrib/check_dhcp.c, plugins/check_snmp.c, plugins/negate.c, + plugins/netutils.c, plugins/urlize.c: spell fix "received" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@818 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: add perfdata function for floats to + complement ints, also spell fix "received" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@817 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: add Ralph Rye for report of check_procs segfault on + AIX/WebSphere and proof-of-concept patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@816 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: handle case where line from ps output exceed + MAX_INPUT_BUFFER + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@815 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-20 Ton Voon + + * AUTHORS: Shaun Wills for patch to check_http + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@814 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Added Content-type when POSTing (Shawn Wills) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@813 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: - compiler warning removed (but usage2 messages + badly broken) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@812 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Matt Pounsett for bug report + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@811 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Different text to scan for if multiple addresses + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@810 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Corrected usage message (Matt Pounsett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@809 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-19 Ton Voon + + * AUTHORS: Michael Musikhin for check_disk patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@808 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Uninitialised variables for -X (Bug 900091 - + Michael Musikhin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@807 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-18 Karl DeBisschop + + * configure.in: version bump (old) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@806 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4, lib/afs.m4, lib/fstypename.m4, lib/fsusage.m4: + underquoted defines cause warning on FC2 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@805 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-18 Ton Voon + + * AUTHORS: Johannes Herlitz for patch to check_dns + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@804 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Output message includes the query_address, as + inspired by Johannes Herlitz. + Also cleanup of comments and handles multi-line nslookup output (MacOSX 10.3) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@803 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-17 Ton Voon + + * AUTHORS: David Alden for check_snmp_procs.pl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@802 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_snmp_procs.pl: Checks remote processes via SNMP (David + Alden) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@801 f882894a-f735-0410-b71e-b25c423dba1c + +2004-02-09 Ton Voon + + * AUTHORS: Patrick McCormick + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@800 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: Fix for check_ping old-style argument handling + (Patrick McCormick - 892211) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@799 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-28 Ton Voon + + * plugins/check_dummy.c: Print optional text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@798 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-21 Karl DeBisschop + + * AUTHORS: credit David Croft (patch check_tcp formultibyte malloc bug + in server_expect) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@797 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: =fix segfault on malloc of server_expect for + multibyte chars (David Croft) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@796 f882894a-f735-0410-b71e-b25c423dba1c + +2004-01-18 Subhendu Ghosh + + * contrib/check_snmp_printer.pl: plugin to check printer status via + snmp, includes page count as perfdata; perl plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@795 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-24 Ton Voon + + * AUTHORS: Bug reporter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@794 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed help doc on use of % (854817 - Gunnar + Hellekson) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@793 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-18 Ton Voon + + * README: Reference to CHANGES file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@792 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Add CHANGES file to distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@791 f882894a-f735-0410-b71e-b25c423dba1c + + * CHANGES: List major changes between releases + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@790 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-11 Ton Voon + + * AUTHORS: For patch to check_http + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@789 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Relative redirects not followed correctly + (854131 - John Sivak) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@788 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-05 Ton Voon + + * AUTHORS: Ben Whaley for reported Solaris 8 /usr/ucb/ps problem in + configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@787 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Not correctly working out ps command if /usr/ucb before + /usr/bin in PATH for + Solaris (reported by Ben Whaley) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@786 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Patch to my_connect + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@785 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h: Fix clash of namespace for + my_connect with mysql (854339 - Ian Holsman) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@784 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-02 Ton Voon + + * plugins/check_disk.c: Default thresholds not defined for lists in -x + parameter (raised by Matt Garrett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@783 f882894a-f735-0410-b71e-b25c423dba1c + +2003-12-01 Karl DeBisschop + + * po/de.po, po/fr.po: commit changes caused by upstream code mods + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@782 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: use usage2 function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@781 f882894a-f735-0410-b71e-b25c423dba1c + + * nagios-plugins.spec.in: add THANKS to %doc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@780 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-28 Ton Voon + + * plugins/check_procs.c: Fixed listing of failed processes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@779 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-24 Ton Voon + + * AUTHORS: For patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@778 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: Bug from code-clean (Antony Simmonds - 846311) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@777 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-21 Karl DeBisschop + + * README: update auotmake/autoconf versions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@776 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: update developer names + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@775 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALLING: our policy now is to use most recent versions of GNU tool + chain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@774 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-19 Karl DeBisschop + + * plugins/check_time.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@773 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: use perfdata() to return perfoamnace data in + stanadrd format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@772 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-17 Karl DeBisschop + + * plugins/check_ups.c: bugfix - each supported option was overwriting + the previous perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@771 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ups.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@770 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@769 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-12 Karl DeBisschop + + * plugins/check_snmp.c: clean up compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@768 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c, plugins/check_nt.c: clean up compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@767 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtgtraf.c, plugins/check_swap.c: clean up compiler + warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@766 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtgtraf.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@765 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: remove overflow checks of strtod - HUGE_VALF + requires C99; also remove equality checks on warn/crit interval which + are no doubles + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@764 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-11 Ton Voon + + * plugins/check_tcp.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@763 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_users.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@762 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Added perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@761 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed if only absolute warn/crit set + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@760 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-10 Ton Voon + + * plugins/utils.h: - typo fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@759 f882894a-f735-0410-b71e-b25c423dba1c + +2003-11-05 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl, + plugins-scripts/check_ifstatus.pl: added plugin timeout options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@758 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-31 Karl DeBisschop + + * plugins/check_nt.c: provide an error message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@757 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: line indentation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@756 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: add perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@755 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mrtg.c: add perf data + fix bug where stale data message would get overwritten + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@754 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-24 Ton Voon + + * plugins/common.h: Ignore __attribute__ for non-GNU compilers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@753 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Moved config.h to toplevel + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@752 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-23 Ton Voon + + * lib/Makefile.am: Need to include intl/ for systems without libintl.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@751 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-21 Ton Voon + + * AUTHORS: Matt Garrett for bug reports + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@750 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_file_age.pl: - Fixed file name (Matt Garrett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@749 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-20 Ton Voon + + * configure.in, lib/fsusage.c, lib/mountlist.c: Fix for config.h at top + level. Required for intl/ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@748 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-15 Ton Voon + + * tools/mail_error: Need to export PATH for sfsnapshot to get correct + GNU toolchain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@747 f882894a-f735-0410-b71e-b25c423dba1c + +2003-10-14 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl: snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@746 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: more snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@745 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: Bug 773588: added check to warn on + matching # candidates only + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@744 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: Added -M for maxmsgsize (v1/v2c) + Added v3 support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@743 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-30 Ton Voon + + * plugins/check_swap.c: Fixed logic problem if HAVE_SWAP, but not on AIX + or Solaris. Removed + unnecessary ifdefs for help page. Better indentation for ifdefs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@742 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-29 Ton Voon + + * lib/Makefile.am: Missed GNU files for AIX 5.1 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@741 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-17 Ton Voon + + * AUTHORS: Added authors of obsolete contrib plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@740 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/maser-oracle.pl: Obsolete from main check_oracle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@739 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_ping: Plugins obsolete from main check_disk and + check_ping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@738 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/strtod.c: Required if strtod not GNU compilant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@737 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, lib/error.c, lib/error.h, lib/error.m4, + lib/malloc.c, lib/realloc.c, lib/unlocked-io.h, lib/xalloc.h, + lib/xmalloc.c: Support to compile on AIX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@736 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: - typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@735 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c: Support for check_swap in AIX + (tested on 5.1) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@734 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Hide error message if docbook not available + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@733 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-16 Ton Voon + + * doc/developer-guidelines.sgml: Added in threshold range format and + updated autoconf to 2.54 for a problem + on Darwin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@732 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_procs.c: Support for + AIX ps command and cleanup of configure's ps checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@731 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/common.h: AIX problem with enum TRUE and FALSE (Ludse + Verhoeven) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@730 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-16 Karl DeBisschop + + * tools/sfsnapshot: here-doc format was not correct + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@729 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: milisecond timing and perfdata, fix NULL pointer + error in validate_arguments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@728 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-15 Ton Voon + + * AUTHORS: Contributors to the perfdata discussion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@727 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins-scripts/check_mailq.pl: Added Exim support (768445 - + Eric Bollengier) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@726 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS, plugins/check_nt.c: Option to verify check_nt version (799098 + - Steve Hanselman) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@725 f882894a-f735-0410-b71e-b25c423dba1c + + * AUTHORS: Jason Burnett for check_disk_smb patch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@724 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: Optionally specify port for + smbclient to use (781227 - Jason Burnett) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@723 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-15 Karl DeBisschop + + * plugins/check_http.c: make status code extensible (thanks to Chris + Wilson ) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@722 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-12 Karl DeBisschop + + * AUTHORS: two new additions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@721 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: new output format reported by Patrick Allen + + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@719 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-11 Karl DeBisschop + + * plugins/check_http.c: use prefdata function for size too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@718 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: use prefdata function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@717 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_swap.c: last changes to configure broke + check_swap on RHLinux. Restore /proc/meminfo check and make check_swap + ifdefs safer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@716 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-04 Karl DeBisschop + + * Makefile.am: change so make-dist works in subdirs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@715 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-03 Ton Voon + + * configure.in: Remove df checks and ignore swap checks if no swap + commands found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@714 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: No named credits in source code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@713 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed substitution for Tru64's ps format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@712 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-03 Karl DeBisschop + + * plugins/check_dig.c: allow warn/crit times to be floating point + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@711 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/common.h: include math.h if needed for HUGE_VAL + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@710 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-02 Ton Voon + + * plugins/check_procs.c: Solaris requires asprintf checks for null + variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@709 f882894a-f735-0410-b71e-b25c423dba1c + +2003-09-01 Ton Voon + + * Makefile.am: Report duplicates in AUTHORS file + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@708 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Add contributor's name into CVS + comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@707 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-31 Ton Voon + + * .cvsignore, AUTHORS, Makefile.am, THANKS.in: Updated AUTHORS to + include all contributors listed in comments in code and + CVS for plugins and plugins-scripts. Still need to do SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@706 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Updated perf data standard for warn + before crit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@705 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-28 Karl DeBisschop + + * plugins/check_game.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@704 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@703 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use single quotes per guideline, also quote when SPC + or = are found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@702 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@701 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: suppress quotes in perf data when not needed (some + plugins need the space to keep below line length limit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@700 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h: add min() macro to complement max() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@699 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-26 Karl DeBisschop + + * plugins/check_dig.c: print perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@698 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c: print perfdata + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@697 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: function to make perfdata output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@696 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-23 Karl DeBisschop + + * plugins/check_http.c: - found and fixed memory allocation error in + rewritten redir() function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@695 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: - hacked interim fix to segfault on redirect - + for tesing only + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@694 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: - fix various format errors with newly added perf + data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@693 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-22 Karl DeBisschop + + * plugins/check_dig.c: - forgot to declare struct timeval tv for hires + timing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@692 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: - add perf data for time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@691 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_game.c, plugins/check_hpjd.c, plugins/check_http.c, + plugins/check_ide-smart.c, plugins/check_ldap.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_smtp.c, + plugins/check_snmp.c, plugins/check_ssh.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/check_time.c, plugins/check_udp.c, + plugins/check_ups.c, plugins/check_users.c, plugins/negate.c, + plugins/urlize.c: - bindtextdomain for gettext, a few other smale + cleanups here and there + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@690 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: * bugfix: snprintf of timestamp truncated '\0' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@689 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-21 Karl DeBisschop + + * plugins/check_http.c: * Check redirections for infinte loops and limit + depth of recursion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@688 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-20 Ton Voon + + * plugins/check_time.c: Optionally use udp instead of tcp (Bradley Baetz + - 751646) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@687 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_wins.pl: Changed netsaint to nagios in use lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@686 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-19 Karl DeBisschop + + * plugins/check_http.c: *BUGFIX: LWS is not required betwwen "Location:" + header field name and field value + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@685 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: *add missing status numbers from RFC 2616 + (HTTP1.1) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@684 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-18 Karl DeBisschop + + * plugins/check_ping.c: move error scans to a new separate routine and + scan both stderr and stdio + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@683 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-11 Ton Voon + + * doc/developer-guidelines.sgml: Performance data guidelines added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@682 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Fixed building snapshots - cvs update ignores new + directories. + Also do not need to run make + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@681 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-10 Karl DeBisschop + + * plugins/utils.c: config.h is redundant (common.h includes it) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@680 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c, plugins/check_smtp.c: perf data in integer + microseconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@679 f882894a-f735-0410-b71e-b25c423dba1c + + * po/POTFILES.in, po/de.po, po/fr.po: first pass at NLS markup done + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@678 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_rpc.pl: proposed fix for LANG issue + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@677 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_game.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/negate.c, plugins/popen.c, + plugins/urlize.c: the last round of pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@676 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Karl DeBisschop + + * tools/devmode: a little shell script to make it a little easier to + produce pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@675 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c, plugins/check_ssh.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@674 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Jeremy T. Bouse + + * plugins/common.h, po/de.po, po/fr.po: Code clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@673 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-09 Karl DeBisschop + + * plugins/check_dig.c, plugins/check_http.c, plugins/check_load.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_ping.c, plugins/check_procs.c, + plugins/check_real.c, plugins/utils.c, plugins/utils.h: more pedantic + compiler warns + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@672 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: more pedantic compiler warns, change to + microsecond output for perf data, add size to perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@671 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: add function for elapsed tim ein + microseconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@670 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@669 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_dummy.c, plugins/popen.c, + plugins/utils.c, plugins/utils.h: more pedantic compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@668 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-08 Karl DeBisschop + + * lib/Makefile.am: include getloadvag.m4 in distrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@667 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/netutils.c, plugins/netutils.h: cleanups + from pedantic complier warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@666 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: change if/elseif block to case, general streamline + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@665 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: fix a variety of compiler warnings about + qualifier discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@664 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_snmp.c, plugins/utils.c, plugins/utils.h: fix a variety of + compiler warnings about qualifier discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@663 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_disk.c, plugins/check_nt.c, + plugins/netutils.c, plugins/netutils.h, plugins/popen.h, + plugins/utils.h: fix a variety of compiler warnings about qualifier + discards and other pedantic stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@662 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c, plugins/check_smtp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@661 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-07 Karl DeBisschop + + * plugins/check_real.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@660 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@659 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: reorder for consistency, restore prototypes for + print_foo, nest #ifdef to avoid pedantic traditional c warn + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@658 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: reorder for consistency (no code changes) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@657 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_disk.c, plugins/check_dns.c, + plugins/check_fping.c, plugins/check_game.c, plugins/check_http.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nagios.c, + plugins/check_nt.c, plugins/check_nwstat.c, plugins/check_overcr.c, + plugins/check_radius.c, plugins/check_real.c, plugins/check_snmp.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/negate.c, plugins/netutils.c, plugins/popen.c, plugins/utils.c, + plugins/utils.h: replace "terminate" with "die" for shorter name and + better readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@656 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: cleanup for better readability + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@655 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@654 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: make must be run before make dist to creat language + files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@653 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-06 Ton Voon + + * doc/developer-guidelines.sgml: Added in that Nagios plugins are + written to GNU standards + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@652 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-06 Karl DeBisschop + + * lib/.cvsignore: ignore ulonglong.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@651 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_overcr.c: markup for translation, move send_buffer + assignment to process_args so process_tcp_request can be moved outside + the conditional, replace if/esleif with switch, replace #defines with + enum + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@650 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@649 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Ton Voon + + * doc/developer-guidelines.sgml: Added dev platform requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@648 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Karl DeBisschop + + * plugins/check_ssh.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@647 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-05 Stanley Hopcroft + + * contrib/check_mssql.sh: Version 2.0 of MS SQL server plugin + (contrib/check_mssql.sh) from T De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@646 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-04 Karl DeBisschop + + * plugins/check_users.c, plugins/urlize.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@645 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_time.c, plugins/check_udp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@644 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c, plugins/check_nagios.c, plugins/check_radius.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/negate.c: markup for + translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@643 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-03 Karl DeBisschop + + * plugins/check_ldap.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c: + markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@642 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@641 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@640 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_ldap.c, plugins/check_tcp.c: + markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@639 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_ide-smart.c: markup for + translation, use common.h, fix problems compiling + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@638 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@637 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-02 Karl DeBisschop + + * plugins/check_hpjd.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@636 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@635 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c, plugins/check_game.c, plugins/check_mysql.c, + plugins/check_snmp.c, plugins/utils.h: markupf for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@634 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: ifdef so utils.h can be header for + utils.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@633 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_fping.c, plugins/check_snmp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@632 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_pgsql.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/utils.h: establish + "UT_" namespace for usage text in #defines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@631 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@630 f882894a-f735-0410-b71e-b25c423dba1c + +2003-08-01 Karl DeBisschop + + * plugins/check_dns.c: terminate in error_scan() so meaningfull errors + can be sent + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@628 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dummy.c: mark for transaltion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@627 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: do not translate the strings that will be + compared to utility output - LC_ALL is set to C so those strings should + be untranslated regardless of the system settings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@626 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.c: set LC_ALL to C in execve environemnt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@625 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: 'ln -f -s ...' is not reliable/portable. Use 'rm + -f ...; ln -s ...' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@624 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-31 Karl DeBisschop + + * plugins/check_dns.c: mark for translation (note problem here - it + relies on tranalation in underlying utility, which has a high chance of + failing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@623 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/utils.h: mark for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@622 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-30 Karl DeBisschop + + * plugins/check_by_ssh.c: mark up for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@621 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_pgsql.c, plugins/check_swap.c, + plugins/check_tcp.c, plugins/utils.h: markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@620 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-29 Karl DeBisschop + + * plugins/check_pgsql.c, plugins/check_swap.c, plugins/check_tcp.c: mark + for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@619 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h: some shared text for internationalized help text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@618 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: clean up warnings about ill-formed comment and string + concatenation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@617 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ChangeLog, README, configure.in, lib/Makefile.am: bump to + gettext 0.11.5 and cleanup GNU toolchain + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@616 f882894a-f735-0410-b71e-b25c423dba1c + + * ABOUT-NLS, INSTALL: get from GNU files instead of storing in CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@615 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: move autopoint to start of gnu toolchain setup + use --force-missing instead on manually copying files + (manual process was broken on RedHat, and we should expect automake to do its job right anyway) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@614 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: look for getloadavg.c in $topdir/lib, not $srcdir/lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@613 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: patch attempt to reference undefined optarg + (credit Paul Farrall) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@612 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-28 Ton Voon + + * configure.in: - Specify srcdir so no confusion + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@611 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/getloadavg.m4: Readded getloadavg.m4 as using + autoconf 2.50+. This fixes redhat 6.2 compiles + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@608 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-26 Karl DeBisschop + + * plugins/check_pgsql.c: mark for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@607 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: add S_ macor to mark message for both translation + and inclusion into docbook SGML + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@606 f882894a-f735-0410-b71e-b25c423dba1c + + * po/de.po, po/fr.po: updated check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@605 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, po/ChangeLog: internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@604 f882894a-f735-0410-b71e-b25c423dba1c + + * intl/.cvsignore, lib/.cvsignore, po/.cvsignore: skip gettext files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@603 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@602 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@601 f882894a-f735-0410-b71e-b25c423dba1c + + * po/Makevars: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@600 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, tools/setup: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@599 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, ABOUT-NLS, ChangeLog, Makefile.am, configure.in, + lib/Makefile.am, lib/gettext.h, nagios-plugins.spec.in, + plugins/Makefile.am, plugins/check_tcp.c, plugins/common.h, + plugins/utils.c, po/LINGUAS, po/POTFILES.in, po/de.po, po/fr.po, + tools/setup: checkins for internationalization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@598 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-21 Karl DeBisschop + + * plugins/common.h: add stubs to allow markup for translation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@597 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/common.h: test GNU_SOURCE and include features.h + if present to clear warning about asprintf definition + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@596 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-20 Karl DeBisschop + + * doc/developer-guidelines.sgml: must use '&' in attribute values + instead of '&' + id tokens (attibute values) must not have embedded spaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@595 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-17 Ton Voon + + * plugins-scripts/check_oracle.sh: - Cleanup comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@593 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Guidelines updated to use Sourceforge + tracker system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@592 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-11 Ton Voon + + * doc/developer-guidelines.sgml: - Fixed CVS commit comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@591 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.sgml: Added in practice of prefixing comments + in CVS commits + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@590 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-04 Karl DeBisschop + + * configure.in, plugins/Makefile.am: only make links for check_spop and + check_simap when SSL is built into check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@586 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-03 Ton Voon + + * plugins/check_procs.c: Fixed seg fault on some Sol 7/8 servers (Patch + 764745 - Alexander Matey) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@585 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Changing $() to `` to be compatible with Solaris' sh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@584 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-03 Karl DeBisschop + + * autogen.sh, tools/setup: mv GNU toolchain check into tools/setup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@583 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: remove LABELLEN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@582 f882894a-f735-0410-b71e-b25c423dba1c + +2003-07-02 Ton Voon + + * plugins-scripts/check_oracle.sh: Check for ORA- errors for tablespace + and cache (patch 755456 - Sven Meyer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@581 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: Update error message from smbclient + v2.2.7 (Patch 740132 - Cove Schneider) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@580 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/.cvsignore, plugins-scripts/Makefile.am, + plugins-scripts/check_file_age.pl, plugins-scripts/subst.in: Moving + check_file_age into core + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@578 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed SUPPORT message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@577 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-30 Jeremy T. Bouse + + * plugins/check_http.c, plugins/check_ldap.c, plugins/check_smtp.c: + Added -4 and -6 command line options into check_http, check_ldap and + check_smtp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@575 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/check_ssh.c, plugins/check_tcp.c, + plugins/netutils.c: Corrections to get code to compile on systems + without IPv6 support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@574 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Added check_simap & check_spop to + check_tcp_programs + If someone knows how to make this conditional in the Makefile only if + being compiled with SSL I think this is the only way to make it better + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@573 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-30 Ton Voon + + * plugins/check_disk.c: Fixed support for "check_disk warn crit [path]" + with thresholds at used levels + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@572 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-29 Jeremy T. Bouse + + * configure.in, plugins/check_ldap.c: Included patch for check_ldap from + Patch #753621 by Ziya Suzen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@571 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/check_tcp.c: Changed usage output to + show -4 and -6 are mutually exclusive. You can only + use one or the other but not both. The last one used will win out. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@570 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c, plugins/netutils.c: check_ping is now coded with + -4 & -6 options to call PING or PING6 command + netutils modified to verify hosts based on address_family setting when used + with -4 or -6 options. is_inet_addr() will not be tested if -6 is + used and is_inet6_addr() will not be tested if -4 is used. Also the + is_hostname() will use the address_family value to resolve hostnames + only if IPv6 support is available otherwise defaults to AF_INET. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@569 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c, plugins/check_tcp.c, plugins/netutils.c, + plugins/netutils.h: Added address_family extern int variable to netutils + to allow for -4 & -6 + options for explicit connection protocol + Added support for -4 & -6 options to check_ssh and check_tcp for testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@568 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-29 Ton Voon + + * plugins/check_nwstat.c: Added NLM test (Phil Randal) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@567 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Corrected reported size for PROC_MEMINFO systems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@566 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfwebcron: Fixed so goes to correct web area + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@565 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfwebcron: New tool to run on shell.sf.net to update the dev + guidelines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@564 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Fixed makefile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@563 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-27 Jeremy T. Bouse + + * plugins/netutils.c: Modified my_connect to include ai_socktype in the + hints to be compliant with + RFC3493 as pointed out by Janos Mohacsi. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@562 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-27 Ton Voon + + * configure.in, plugins/check_swap.c: Support for swap -s for solaris. + Also changes size of swap to MBs through + a conversion amount in configure. Possible breakage on other OSes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@561 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/makefile: Remove if which check - done in tools/setup instead + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@560 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: Fiddling as Solaris' which command is broken + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@559 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-26 Ton Voon + + * plugins/check_disk.c: Fixed different thresholds if using exclude + lists + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@558 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-25 Ton Voon + + * plugins/check_disk.c: Support for different thresholds for different + filesystems + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@557 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Removed -d option and just check against -p + parameter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@556 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Report errors if path specified not found + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@555 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: Problems compiling on SunOS 5.6 with gcc 2.8.1. + Fixed by specifying + floating variables, rather than letting asprintf work it out + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@554 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-21 Karl DeBisschop + + * plugins/Makefile.am: soalris 8 needs 'ln -s -f' instead of 'ln -sf' + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@552 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: add remaining URI_PATH chars per RFC 2396 + remove '-' from URI_PORT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@549 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-12 Jeremy T. Bouse + + * command.cfg.in: Renamed duplicate check_snmp command definitions to be + unique + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@548 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in, configure.in: Made the two check_ifoperstatus commands + unique to remove conflicts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@547 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-11 Karl DeBisschop + + * plugins/check_http.c: fix URI_PATH to allow ?&#: (more still should be + allowed) + fix class to be POSIX compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@546 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-10 Karl DeBisschop + + * contrib/urlize.pl: add comment about shell quote removal to address + https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@544 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/urlize.c: add note about shell quote removal to address + https://sourceforge.net/tracker/index.php?func=detail&aid=661916&group_id=29880&atid=397597 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@543 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-08 Ton Voon + + * configure.in: Fixed quoting on SWAP_FORMAT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@540 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Support for OpenBSD 3.2 & 3.3 ps (Julien Touche) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@539 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-07 Subhendu Ghosh + + * plugins/check_real.c: \r\n patch from Mathias + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@537 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-04 Ton Voon + + * plugins/check_disk.c: Argument to asprintf in wrong order + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@533 f882894a-f735-0410-b71e-b25c423dba1c + + * pkg/solaris/solpkg: Remove /usr as well. Maybe this is best done by + changing BASEDIR to + configure's prefix? + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@532 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-02 Karl DeBisschop + + * plugins/check_tcp.c: finish recv() loop when stream GT or EQ maxbytes + (was GT) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@531 f882894a-f735-0410-b71e-b25c423dba1c + +2003-06-01 Karl DeBisschop + + * plugins/check_tcp.c: allow user to limit number of bytes fetched + fix some doco (wait is now delay, server_quit was not shown) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@529 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-31 Karl DeBisschop + + * plugins/check_dns.c: first revised patch failed to trap the "break" in + while() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@526 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-27 Stanley Hopcroft + + * contrib/check_sap.sh: check_sap.sh plugin to check SAP /R3 servers + from Karel Salavec and Tom De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@523 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-26 Stanley Hopcroft + + * contrib/check_axis.sh, contrib/check_mssql.sh: Revisions to Tom De + Blende contributed plugins: check_axis.sh and check_mssql.sh + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@522 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-17 Ton Voon + + * plugins/t/check_ftp.t: Fixed test (Mathew Ericson - 738609) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@521 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_load.t: Fixed tests (Mathew Ericson - 738607) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@520 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_procs.t: Fixed test commands (Mathew Ericson - 738605) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@519 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_http.t: Fixed tests (Mathew Ericson - 738608) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@518 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/t/check_tcp.t: Fixed tests (Mathew Ericson - 738604) + CV: ---------------------------------------------------------------------- + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@517 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-16 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: bug fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@515 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-14 Ton Voon + + * plugins/negate.c: Added examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@514 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: Added postfix support (Thomas Nilsen - + 735218) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@513 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nwstat.c: Added DSVER and UPTIME checks (Phil Randal - + 737617) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@512 f882894a-f735-0410-b71e-b25c423dba1c + + * pkg/solaris/solpkg: Typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@511 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/.cvsignore: Ignore developer-guidelines.html as generated from + docbook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@510 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Remove + dependency on gnu make + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@509 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-13 Ton Voon + + * doc/developer-guidelines.sgml: Updated docs to include comments, + contrib->main, getopts_long and + verbose output levels + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@508 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Calls tools/setup and creates a README for the + snapshot directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@507 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/developer-guidelines.html, doc/makefile, tools/setup: The + developer-guidelines.html file is now generated from the sgml file + by docbook2html at tools/setup time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@506 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-13 Stanley Hopcroft + + * contrib/tarballs/hopcroft-plugins.tar.gz: Removed + contrib/tarballs/hopcroft-plugins.tar.gz. This is archaic, + anachronistic, unmaintained and humblingly embarrassing. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@505 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_mssql.sh: check_mssql.sh. A new plugin from Mr T DE + BLENDE to check MS SQLServer databases. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@504 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-09 Karl DeBisschop + + * plugins/check_http.c: fix error when server closes connection + immediately + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@503 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cause snmpget try try for 1 second less than the + timeout (allowing plugin to force close if needed) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@501 f882894a-f735-0410-b71e-b25c423dba1c + +2003-05-07 Jeremy T. Bouse + + * plugins/check_ping.c: Modified check_ping to handle IPv6 as well as + IPv4 ICMP checks using the + PING6_COMMAND determined during the configure script execution. As + USE_IPV6 may be defined and PING6_COMMAND is not defined if there is not + IPv6 TCP stack available when configure is run I condition it off + PING6_COMMAND existing to remove build errors for being undefined. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@500 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-25 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: corrected output units + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@499 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-23 Karl DeBisschop + + * plugins/check_http.c: update to RFC1123 hostname specs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@498 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-17 Karl DeBisschop + + * nagios-plugins.spec.in: add check_nt, drop check_vsz + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@497 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_tcp.c, plugins/check_users.c: code + cleanup to clear strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@496 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_tcp.c, plugins/netutils.c: code + cleanup to clear strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@495 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-16 Subhendu Ghosh + + * plugins/check_real.c: reset to old behavior of not checking stream by + default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@493 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-13 Subhendu Ghosh + + * plugins/check_hpjd.c: reduce compiler warning between gcc3 and gcc2.96 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@492 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/utils.pm.in: update for check_mailq - + qmail support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@491 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_mailq.pl: Added sendmail multi-queue support + (Canau), merged qmail support (Schmid) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@490 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-11 Ton Voon + + * plugins/check_procs.c: Match -a STRING anywhere in ps args (Laurent + Vaslin - 719783) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@488 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-11 Subhendu Ghosh + + * plugins-scripts/check_ifstatus.pl: added feature -u (list of unused + ifIndex) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@487 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: bug 691412, added feature -x (list + of excluded ifTypes) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@486 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: patch 698384 - order of args to snmpget + print + a bit of stderr + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@485 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-09 Karl DeBisschop + + * plugins/check_hpjd.c, plugins/check_http.c, plugins/check_nt.c: + cleanup to suppress various strict compiler warnings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@483 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: rewrite #elif to be compatible with traditional C + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@482 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: check_game needs popen.c now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@481 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-08 Ton Voon + + * command.cfg.in: Updated command for new check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@479 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c, plugins/check_nt.c: Changed // to /* */ comments + as some compilers do not like them + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@478 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-08 Stanley Hopcroft + + * contrib/check_axis.sh: check_axis.sh (Axis 5xx print servers) from Tom + De Blende + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@477 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-07 Ton Voon + + * plugins/check_procs.c: Fixed zombie processes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@476 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Missed some PS_FORMAT strings + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@475 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/Makefile.am, plugins/check_nagios.c, + plugins/check_procs.c, plugins/check_vsz.c: Souped up check_procs with + different metrics + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@474 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Removed unnecessary regex array + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@472 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-07 Karl DeBisschop + + * plugins/check_http.c: ste timeout one second greater than critical + time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@471 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: had been grandfathered ibto core, finally use + normal getopts, add options for player, max-player array positions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@470 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-03 Ton Voon + + * plugins-scripts/check_oracle.sh: Cleaned up cache output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@469 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-01 Ton Voon + + * plugins-scripts/check_oracle.sh: Fixed sqlplus calls and rearranged + parameters for --tablespace & --cache + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@468 f882894a-f735-0410-b71e-b25c423dba1c + +2003-04-01 Karl DeBisschop + + * configure.in: remove PATH_PROG call for autoconf/automake components + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@467 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-31 Karl DeBisschop + + * plugins/check_disk.c: checkpoint + supresses iso9660 + adds option for checking only local + adds choice of scale factor + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@466 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-27 Ton Voon + + * plugins/check_nwstat.c: Extra Netware checks (Patch 710247 - Dietmar + Ruzicka) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@465 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-26 Ton Voon + + * configure.in: ipv6 check requires unistd.h for Darwin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@464 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_procs.c: Removal of ps_raw and ps_vars + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@463 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: Uses same ps command as check_procs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@462 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-25 Karl DeBisschop + + * .cvsignore: subst is no longer used + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@461 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-24 Jeremy T. Bouse + + * .cvsignore, Makefile.am: Better stripping of prefix for Solaris + package install needs to remove + /usr/local as package installs there by default + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@460 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, pkg/solaris/.cvsignore, pkg/solaris/pkginfo.in, + plugins/check_disk.c: Minor changes to build for Solaris packages + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@459 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-24 Ton Voon + + * plugins/check_procs.c: Use max_state + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@458 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error, tools/sfsnapshot: PATH set in correct place and + extra comments + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@457 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error, tools/sfsnapshot: Bug fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@456 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/mail_error: Sends email if non-zero return code from command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@455 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Error code depending on number of files generated + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@454 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/ls-mntd-fs.m4: Using coreutils 4.5.11 version to fix Darwin + problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@453 f882894a-f735-0410-b71e-b25c423dba1c + + * REQUIREMENTS: Add NSClient requirement for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@452 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Reference to web site to get NSClient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@450 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-23 Jeremy T. Bouse + + * Makefile.am, autogen.sh, configure.in, lib/Makefile.am, + pkg/solaris/pkginfo.in, pkg/solaris/solpkg: Solaris package build system + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@449 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-23 Karl DeBisschop + + * plugins/check_disk.c: can once again exclude indiviual path/partitions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@448 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add -X to exclude FS type, now works with more + than one path/dev specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@447 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-22 Karl DeBisschop + + * plugins/utils.c: declaration must precede printf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@446 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-21 Karl DeBisschop + + * plugins/check_disk.c: checkpoint, allows selecting devices and paths + now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@444 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: instructions for posting plugin version number + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@443 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-19 Karl DeBisschop + + * plugins/check_by_ssh.c: allow to specify -1 and -2 for protocol + version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@442 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h: make state_text a function + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@440 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/mountlist.c, plugins/check_disk.c: check_disk working with + mountlist.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@439 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in: subst.* was replaced by dist-hook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@438 f882894a-f735-0410-b71e-b25c423dba1c + + * subst.in, subst.sh: these were replaced by dist-hook + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@437 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-18 Karl DeBisschop + + * configure.in: running the AFS macro causes newer AC/AM to barf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@436 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: afs checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@435 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/afs.m4, lib/ls-mntd-fs.m4: use AC_DEFINE_UNQOUTED + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@434 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/ls-mntd-fs.m4: stop warning on autoheader 2.13 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@433 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h: common.h was doubly included + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@432 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h: use enum instead of define, remove some cruft from + old snprintf implementation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@431 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/check_disk.c: use GNU fileutils + for check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@430 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/afs.m4, lib/fstypename.m4, lib/fsusage.c, lib/fsusage.h, + lib/fsusage.m4, lib/ls-mntd-fs.m4, lib/mountlist.c, lib/mountlist.h: + from GNU fileutils for check_disk + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@429 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-17 Ton Voon + + * plugins-scripts/check_oracle.sh: Allow default Oracle home from oratab + (reported by Walbert Oberngruber) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@428 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-16 Jeremy T. Bouse + + * configure.in: Modified to automatically enable getaddrinfo emulation + if lwres is not used and + getaddrinfo is not found in the system. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@427 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c, plugins/netutils.c, plugins/netutils.h: Applied + patch #660973 for tcp refusals + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@426 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-15 Jeremy T. Bouse + + * configure.in: Left over debug define + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@425 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, lib/Makefile.am, plugins/Makefile.am, + plugins/getaddrinfo.c, plugins/getaddrinfo.h, plugins/gethostbyname.c, + plugins/gethostbyname.h, plugins/netutils.c, plugins/netutils.h, + plugins/utils.c, plugins/utils.h: Spent the day working on backwards + compatability using getaddrinfo() + Moved getaddrinfo.? and gethostbyname.? from lib/ to plugins/ due to + problems with compiling into the libnagiosplug.a as it required linking + against socket libraries which are unneeded except for network based + plugins. + This code should hopefully happily work for all systems and has been tested + prior to commit on Debian GNU/Linux, SPARC Solaris 7 and SPARC Solaris 9. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@424 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-14 Karl DeBisschop + + * plugins-scripts/check_ntp.pl: add timeout, fix taint chacking diom + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@423 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * .cvsignore, configure.in, lib/Makefile.am: Working out issues with + getaddrinfo emulation build environment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@422 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Ton Voon + + * plugins/check_dns.c, plugins/check_http.c, plugins/check_tcp.c: Strip + leading spaces in perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@421 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Perf data without leading spaces and fix ANSI C + complaint about \n + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@420 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Fix compiler warnings re progname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@419 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * depcomp: Removed auto-tools script that automake adds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@418 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, configure.in, install-sh, missing, mkinstalldirs, + plugins/.cvsignore, plugins/Makefile.am, plugins/common.h, + plugins/netutils.h, plugins/popen.h, plugins/utils.c, plugins/utils.h, + plugins/version.h.in: Updated cvs ignore files to reflect changes + Moved header files from being ran through configure to standard + Removed auto-tools scripts that get added by automake + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@417 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Karl DeBisschop + + * plugins/negate.c: negate must be POSIXly correct in handling options, + else wrapped options get passed to it + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@416 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-13 Jeremy T. Bouse + + * configure.in: Removed --with-ipv6 configure option so it determines + IPv6 availablity + completely on it's own per suggestion by Karl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@415 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Jeremy T. Bouse + + * plugins/check_tcp.c: doco standarization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@413 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/subst.in: Just a lil namespace clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@412 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Minor fix to --with-ipv6 behavior + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@411 f882894a-f735-0410-b71e-b25c423dba1c + + * autogen.sh, configure.in, plugins/utils.c, plugins/utils.h.in: Added + autogen.sh script that rebuilds using autotools and runs configure + Modified configure.in to include some debug build option info at the end + of the scripts execution. Can be removed by release time. + Modified configure.in to include a --with-ipv6 option + Default build is without IPv6 support now to enable you need to use the + --with-ipv6 command line option to configure. + Modified plugins/utils.* to use USE_IPV6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@410 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Karl DeBisschop + + * plugins/check_disk.c: doco standarization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@409 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: errors for statfs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@408 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: comment/doco cleanup for embeeded doc work, + control STMP command via options instead of defines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@407 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: version increase, statfs work + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@406 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Jeremy T. Bouse + + * plugins/.cvsignore: Add some more extra plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@405 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Clean up of output from plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@404 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_udp.c: Code clean-up + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@403 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: Code cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@402 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-12 Ton Voon + + * plugins/check_dns.c: Removed is_host checks to speed up code. Fixed + timings so no spaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@401 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Timings in milliseconds and nicer output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@400 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Ton Voon + + * plugins-scripts/.cvsignore: Add script ignores + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@399 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Remove getopt_long checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@398 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Fixed reading too many argv parameters and changed + to asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@397 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_fping.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide-smart.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nt.c, + plugins/check_nwstat.c, plugins/check_overcr.c, plugins/check_pgsql.c, + plugins/check_ping.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c: Remove getopt_long checks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@396 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Jeremy T. Bouse + + * configure.in: Fixed some ping6 variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@395 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Minor change to Karl's statfs check + Inclusion of ICMPv6 ping tests to define PING6_COMMAND + Minor fix to ps syntax checking to fix bug I introduced last nite + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@394 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, configure.in: Removed acconfig.h from EXTRA_DIST + Fixed problem with test in SWAP_FORMAT and SWAP_COMMAND + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@393 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Karl DeBisschop + + * configure.in, plugins/check_disk.c: use statfs for check_disk (still + needs fs scan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@392 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-11 Jeremy T. Bouse + + * acconfig.h, configure.in: Finishing clean-up of configure.in + Removing acconfig.h as it's no longer needed + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@391 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-10 Jeremy T. Bouse + + * acconfig.h, configure.in: Cleaned up configure for PS and PING to + produce cleaner config.h + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@390 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-09 Jeremy T. Bouse + + * plugins/common.h.in: Make sure sys/socket.h is explicitly included if + HAVE_SYS_SOCKET_H is defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@389 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-09 Ton Voon + + * plugins/check_disk.c: Implement error-only option for check_disk (Ian + Duggan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@388 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Ton Voon + + * plugins/check_disk.c: Fix AIX /proc filesystem (Ian Duggan) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@387 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: snprintf checks in configure.in like samba + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@386 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Jeremy T. Bouse + + * plugins/check_dns.c: Modified code to call is_addr() rather than + is_dotted_quad() with the + new AF indepdent function routines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@385 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/netutils.c, plugins/netutils.h.in, plugins/utils.c, + plugins/utils.h.in: AF indepedent routines introduced. + Modifed process_request() & my_connect() parameters to make 'proto' type + 'int' rather than 'char *' and use IPPROTO_* POSIX values. + Removed is_dotted_quad() & my_inet_aton() functions + Added is_addr(), is_inet_addr(), is_inet6_addr() and resolve_host_or_addr() + functions to check whether it is a valid IP address + Modified is_host() to call is_addr() and is_hostname() + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@384 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-08 Ton Voon + + * tools/sfsnapshot: Need to remove configure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@383 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/snprintf.c, plugins/Makefile.am: Move snprintf + into lib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@382 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Have to run through whole automake procedure as + datestamp in RELEASE variable + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@381 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Added automake parameters for config.sub and + config.guess + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@380 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Fixed production OUT variable + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@379 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: Adds MD5SUM file, creates multiple branch snapshots + and doesn't + rerun configure/automake/autoconf unnecessarily + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@378 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Use Makefile's variables (to support a shortcut in + sfsnapshot) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@377 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-07 Jeremy T. Bouse + + * configure.in, lib/Makefile.am, lib/getaddrinfo.c, lib/getaddrinfo.h, + lib/gethostbyname.c, lib/gethostbyname.h, plugins/check_pgsql.c, + plugins/common.h.in, plugins/netutils.c, plugins/netutils.h.in, + tools/setup: Added getaddrinfo.[ch] & gethostbyname.[ch] to provide + RFC2553 functions + if missing in system libs and lwres not present + Moved all references to netdb.h and sys/socket.h into common.h.in + Modified automake call in tools/setup to include adding missing files + so config.sub and config.guess will be available + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@376 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-07 Karl DeBisschop + + * plugins/check_smtp.c: millisecond timing and perf data + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@374 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: whole timer loop was on the wrong side of + connection close code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@373 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: fix for -H invocation of hostname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@372 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-06 Jeremy T. Bouse + + * acinclude.m4, configure.in: Adds --with-lwres and + --enable-emulate-getaddrinfo but are not used in any of + the code at this time. Has a check for IPv6 support but only runs if using the + emulate-getaddrinfo routines, this needs to be modified. + !!! I need input from results of this run on various platforms to see what + results are seen in plugins/config.h so please help test !!! + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@371 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-05 Karl DeBisschop + + * plugins-scripts/check_ntp.pl: add "m" to regex for minutes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@370 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-05 Ton Voon + + * plugins/check_http.c: check_http min size option (680467 - Dave Viner) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@365 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-04 Ton Voon + + * plugins/check_nt.c: Make output message for CPU Load a bit nicer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@364 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/sfsnapshot: To create nagiosplug daily snapshots on SF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@363 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-03 Karl DeBisschop + + * plugins/check_ping.c: accept comma-delimted list of hosts for checking + if a multihomed host is alive + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@362 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-02 Karl DeBisschop + + * plugins/check_ping.c: add logic to check multiple servers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@361 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: update from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@360 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, nagios-plugins.spec.in: adjustments to remove beta + tagging + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@359 f882894a-f735-0410-b71e-b25c423dba1c + + * ChangeLog: update from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@358 f882894a-f735-0410-b71e-b25c423dba1c + +2003-03-01 Karl DeBisschop + + * nagios-plugins.spec.in: we were missing some docs in the RPM + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@357 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-23 Subhendu Ghosh + + * REQUIREMENTS: Novell requirements + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@356 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_bgpstate.pl: removed community string in CRIT message + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@355 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-22 Ton Voon + + * configure.in: Solaris and Unixware labels round the wrong way for swap + command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@354 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-22 Karl DeBisschop + + * Makefile.am: provide target for nagios-plugins.spec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@353 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: add CODING FAQ LEGAL to distribution tarball + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@352 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-21 Ton Voon + + * plugins/check_http.c: Fixed coredump with unallocated string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@351 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: Strip leading spaces on dns return value (689563 + - Simon L Nielsen) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@350 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-20 Karl DeBisschop + + * plugins-scripts/check_disk_smb.pl: option regexs need to include ^ and + $ + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@348 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Ton Voon + + * lib/Makefile.am: Removing getloadavg.m4 from dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@347 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Karl DeBisschop + + * INSTALL, configure.in, lib/getloadavg.m4, tools/setup: remove + getloadavg.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@346 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-19 Ton Voon + + * Makefile.am, configure.in, lib/Makefile.am, lib/getloadavg.c, + lib/getloadavg.m4, plugins/Makefile.am: Move getloadavg to lib + directory. Must run "aclocal -I lib" + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@345 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Karl DeBisschop + + * plugins/check_pgsql.c: spurious backslash escape + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@344 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: set tag for beta3, fix pgsql detection + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@343 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: never exited getopt loop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@342 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: failed if header was more than 1023 bytes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@341 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Ton Voon + + * plugins/check_load.c: Fixed the output messages (Bug 688729 - Jayjay) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@340 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Add SUPPORT file to distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@339 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Fixed compiler warning and increased the SSL + random key for a Solaris PRNG problem + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@338 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Karl DeBisschop + + * configure.in: remainder of ps fix for UnixWare, and move [] in if/elif + to indicate m4 quoting instead of test invocation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@337 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-18 Subhendu Ghosh + + * contrib/check_appletalk.pl: Appletalk ping plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@336 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: OID type prefix patch [Patches-679403] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@335 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: support for Large swap sizes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@334 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: regex fix to catch *BSD swapinfo and not HP-UX error and + memory/file swap in addition to device for HP-UX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@333 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-17 Karl DeBisschop + + * configure.in: typo in testing uname output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@332 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: ping and swap for unixware + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@331 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: library search dirs are part of LDFLAGS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@330 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-17 Subhendu Ghosh + + * REQUIREMENTS: location updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@329 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Ton Voon + + * plugins/Makefile.am: Fixed dependencies for check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@328 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Coredump if no variable set (reported by Marc C. + Poulin) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@327 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Ethan Galstad + + * contrib/check_dhcp.c: Interface patch byor Clemens Resen + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@326 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-16 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: all alphanumeric accepted for refid on + ntpq + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@325 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-12 Ton Voon + + * plugins/.cvsignore: Added extra plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@324 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/.cvsignore: Add ignore files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@323 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: Remove unnecessary \ and fix coredump with no + parameters specified + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@322 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: Remove unnecessary \ - complaints from Tru64's + cc compiler + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@321 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Inadequate quoting for PS_FORMAT & removal of grep "*** + for Tru64 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@320 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-12 Subhendu Ghosh + + * command.cfg.in: forced ntpq jitter check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@319 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifoperstatus.pl: added timeout alarm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@318 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: fixed regex for stratum1 peer, added + logic for failed ntpq call(e.g. sntp host) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@317 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-11 Ton Voon + + * plugins/check_mysql.c: Patch by Dave Viner for seg fault on RH 7.3 + (655903) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@316 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Ton Voon + + * configure.in: Update with references to REQUIREMENTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@315 f882894a-f735-0410-b71e-b25c423dba1c + + * Requirements: Remove file, superceded by REQUIREMENTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@314 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/getopt.c, plugins/getopt.h, plugins/getopt1.c: Removing getopt + files - now in new lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@313 f882894a-f735-0410-b71e-b25c423dba1c + + * lib/Makefile.am, lib/getopt.c, lib/getopt.h, lib/getopt1.c: New + directory for common library files + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@312 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/common.h.in: Added in a define for HAVE_GETOPT_H for backwards + compatibility + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@311 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Remove unnecessary getopt references and link in + lib directory + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@310 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Removing checks for getopt.h - now always available. + Also support lib dir + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@309 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: Adding lib directory for getopts change + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@308 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Fixed Tru64 ps command (Bug 669585 - Paula Arnold) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@307 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Jeremy T. Bouse + + * plugins/check_ssh.c: Added argc checks before attempting to access + argv[] + + Corrected return codes and output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@306 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c: Revised code to use resolving and connection code + in utils.c and + netutils.c rather than its own functions. + Corrected code to properly handle input of server hostname and port on + commandline without option flags. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@305 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-10 Karl DeBisschop + + * contrib/check_fping_in.c: this plugin is in core as check_fping + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@304 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Jeremy T. Bouse + + * tools/setup: Reordered program calls so autoheader was called before + automake thus + getting rid of errors for header files not being present when automake + was called. Also puts it inline with documentation in + INSTALL & INSTALLING + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@303 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Subhendu Ghosh + + * contrib/check_adptraid.sh, contrib/check_compaq_insight.pl, + contrib/check_file_age.pl: new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@302 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/README.TXT: file rename + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@301 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_remote_nagios_status.pl, contrib/check_wins.pl, + contrib/sched_downtime.pl: more contribs + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@300 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/fetchlog-0.92.tar.gz, + contrib/tarballs/fetchlog-0.94.tar.gz: new version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@299 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Karl DeBisschop + + * CODING, README: spell check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@298 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ: spell check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@297 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-09 Subhendu Ghosh + + * SUPPORT: ispell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@296 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-08 Karl DeBisschop + + * plugins/check_pgsql.c: use enum instead of define + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@295 f882894a-f735-0410-b71e-b25c423dba1c + + * FAQ: add item on submitting new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@294 f882894a-f735-0410-b71e-b25c423dba1c + + * SUPPORT: suggest minimum standards for support requests + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@293 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: submit request with one send + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@292 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-05 Karl DeBisschop + + * configure.in: fix for SSL build on RedHat rawhide + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@291 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dns.c: allow check to proceed using servers from + resolv.conf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@290 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: fix segfault due to bad asprintf invocation + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@289 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-04 Subhendu Ghosh + + * plugins-scripts/Makefile.am: install user:grp perms [patch 679703 + -Detlef Boehm] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@288 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_flexlm.pl: lmstat output update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@287 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: corrected ntpdate offset to seconds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@286 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-03 Ton Voon + + * plugins/check_snmp.c: Avoid core dump with null or invalid data + (679400 - Mathieu Masseboeuf) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@285 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: Patch for Mac OS X compile (652080 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@284 f882894a-f735-0410-b71e-b25c423dba1c + +2003-02-03 Subhendu Ghosh + + * contrib/tarballs/check_cit.tgz: Citrix plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@283 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: more sample command configurations + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@282 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/check_ntp.pl, + plugins-scripts/utils.pm.in: change ntpdc to ntpq (Jonathan Rozes,Thomas + Schimpke, bug-656237 ) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@281 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: patch for desync peer and ntpdate (James + Fidell) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@280 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: bugfix [bug 651021 mperry2] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@279 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: added default community [bug-patch #600349 + jbaumgartner] + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@278 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-31 Ton Voon + + * plugins/check_procs.c: Fix for zombie processes on Solaris (Bug 677803 + - Matthew Brown) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@277 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Reapply all asprintf calls. Fix for %% problem + with -l flag. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@276 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nt.c: Removed all unnecessary asprintf calls. Replaced + with original check_nt.c + to minimise amount of changes (reported by Reuben Farrelly) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@275 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-30 Ton Voon + + * plugins/check_nt.c: Added reference to the official NSClient web site + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@274 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_swap.c: Fixed long --allswap option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@273 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Fixed progname + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@272 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Ton Voon + + * plugins/check_mrtgtraf.c: Fixed error and success codes (638656 - Paul + Dlug) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@271 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Added cache and tablespace check + (621567 - John Marquart) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@270 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_nt.c: Added in check_nt for bug + 646516 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@269 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Karl DeBisschop + + * plugins/check_mysql.c: remove incorrect check_disk() declaration + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@268 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ldap.c: fix segfault when argc>=2 and the -H or -b + options are not supplied + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@267 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: 1.8 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@266 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-29 Ton Voon + + * plugins/check_http.c: Better error if server requests client based + certificate (609382 - Olaf Greis) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@265 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_dns_random.pl: Exit code added (604837 - Lachlan + Cameron-Smith) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@264 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Added dummy login test (650970 - Ton + Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@263 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_vsz.c: Error when no params passed, better invalid + params message (652086 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@262 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: Fixed NULL status in Solaris (644783 - Fabian + Pehla) + Fixed -p options (652082 - Ton Voon) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@261 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-28 Karl DeBisschop + + * contrib/checkciscotemp.pl: typo: had commented use Net::SNMP for + testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@260 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_real.c: make sure host_name is set and remove NULL + string inits that can lead to segfaults + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@259 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c: missed argc check on port parameter + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@258 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/checkciscotemp.pl: split and validate input more robustly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@257 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: remove NULL string inits that can lead to + segfaults + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@256 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-28 Ton Voon + + * configure.in: ps support for Darwin / MacOSX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@255 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-27 Karl DeBisschop + + * plugins/check_http.c: do not pass host if none is provided + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@254 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: we were sending extra CRLF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@253 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-19 Karl DeBisschop + + * plugins-scripts/check_rpc.pl: indicate new default state in + get_rpcinfo, also fix a bunch of indents for consistent format + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@252 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-17 Subhendu Ghosh + + * plugins-scripts/check_rpc.pl: bug fix for state and opt_c + initialization + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@251 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: Counter32 tag parsing added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@250 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-16 Karl DeBisschop + + * plugins/check_mysql.c, plugins/check_pgsql.c: semicolon needed where + progname define was replaced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@249 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: add option to let regex span newlines + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@248 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_game.c: progname and print_usage need to be defined + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@247 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_radius.c: semicolon needed where praogname define was + replced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@246 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: semicolon needed where praogname define was + replced + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@245 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: find kerberos libs in latest Red Hat beta + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@244 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: restore max() macro + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@243 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: cleanup progname assignment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@242 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: accept $ for share and \\ for users + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@241 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: avoid segfault when host is not given + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@240 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-13 Karl DeBisschop + + * contrib/check_dhcp.c, contrib/check_fping_in.c, contrib/check_rbl.c: + convert PROGANE from a define to a const char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@239 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_http.c, plugins/check_ldap.c, + plugins/check_load.c, plugins/check_mrtg.c, plugins/check_mrtgtraf.c, + plugins/check_mysql.c, plugins/check_nagios.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_radius.c, plugins/check_real.c, + plugins/check_smtp.c, plugins/check_snmp.c, plugins/check_ssh.c, + plugins/check_swap.c, plugins/check_tcp.c, plugins/check_time.c, + plugins/check_udp.c, plugins/check_ups.c, plugins/check_users.c, + plugins/check_vsz.c, plugins/negate.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h.in: convert PROGANE from a define to a + const char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@238 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.c: change exit status to be POSIX compliant + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@237 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_nagios.c: check for a few null strings, change PROGNAME + from #define to const *char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@236 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: add options for excluding devices and for + skipping OK devices in summary + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@235 f882894a-f735-0410-b71e-b25c423dba1c + +2003-01-03 Karl DeBisschop + + * plugins/utils.c: protect against some null strings, make formats more + uniform + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@234 f882894a-f735-0410-b71e-b25c423dba1c + +2002-12-19 Karl DeBisschop + + * plugins/check_tcp.c: expect is +OK for SPOP too + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@233 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: server expect not getting set, expect is +OK for + POP + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@232 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: remove spurious CRLF + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@231 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-29 Stanley Hopcroft + + * contrib/check_citrix: New plugin to check the ICA browse service (used + by Citrix Metaframe servers) from + Ed Rolison and Tom De Blende. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@230 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-25 Karl DeBisschop + + * plugins/check_tcp.c: was segfaulting if no dtat was returned + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@228 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-24 Karl DeBisschop + + * tools/snapshot: some fixes needed to move off old devel box + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@227 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/snapshot: make routine snapshots of nagios and plugin CVS to + expand testing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@226 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-22 Karl DeBisschop + + * plugins/check_ups.c: add replace battery condition, replace unchecked + strcat calls with asprintf (I do not think buffer overflow was possible + here, but lets be consistent) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@225 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on check_procs by putting + incantations with -w ahead of others + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@224 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on linux check_procs, + actually works this time (needs OpenBSD testing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@223 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: add a few comments, trap a few place where a + NULL string might have been handled + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@222 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: get long args output to work on linux check_procs (needs + OpenBSD testing) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@221 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-21 Karl DeBisschop + + * plugins/check_dig.c: fix empty output on errors + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@220 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-20 Karl DeBisschop + + * plugins/check_swap.c: add switch to evaluate each swap individually + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@219 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: fix solaris SEGV, still need to print meaningful + error text + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@218 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: in short options, t no no argument + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@217 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_dig.c: replace some strcpy with strscpy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@216 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-19 Karl DeBisschop + + * plugins/Makefile.am: another try at portable symlinking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@215 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: another try at portable symlinking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@214 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_time.c: explicitly cast recv() arg2 for SunOS5.6 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@213 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: rewrite of install-exec-hook for solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@212 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-18 Subhendu Ghosh + + * contrib/check_javaproc.pl, contrib/nagios_sendim.pl: javaproc, sendim + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@211 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib-reporting/process_perfdata.pl: New directory to for perfdata + and reporting scripts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@210 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-18 Karl DeBisschop + + * plugins/check_swap.c: test total swap instead of individual disks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@209 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: failed to handle multple disks + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@208 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: more readable max_state() code + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@207 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-16 Karl DeBisschop + + * plugins/Makefile.am: fix too many sources problem for programs tha are + symlinks to check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@206 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: my take on Subhendu's patches, plus a few + comments for clarity + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@205 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-15 Subhendu Ghosh + + * plugins/check_snmp.c: memory bounds in options, no output comparison + case + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@204 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-15 Karl DeBisschop + + * nagios-plugins.spec.in: make spec work again, now that release is in + source name again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@203 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: release numbering fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@202 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: fix label handling, replace accidentally deleted + elseif l.310 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@201 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-14 Karl DeBisschop + + * Makefile.am, acconfig.h, configure.in, nagios-plugins.spec.in, + plugins/utils.c: fix bug with gettimeofday test, improve version/release + handling, update rpm spec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@200 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: fix typo in snprintf build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@199 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: can't drop these sources -- neded for dist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@198 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: fix build rule for snprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@197 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: pagesize count off by one + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@196 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: clean up NULL from status on Solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@195 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: typo in AC_DEFINE of PS_FORMAT for solaris + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@194 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: remove check_nt again + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@193 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: back out last change -- it was only work in + progress + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@192 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am, plugins/check_dns.c, plugins/check_ldap.c, + plugins/check_mrtg.c, plugins/check_mrtgtraf.c, plugins/check_nwstat.c, + plugins/check_radius.c, plugins/utils.c, plugins/version.h.in: remove + call_getopt and ssprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@191 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-13 Karl DeBisschop + + * plugins/check_disk.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_mrtg.c, plugins/check_nwstat.c, + plugins/check_ping.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c: remove call_getopt and asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@190 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-12 Karl DeBisschop + + * plugins/check_dig.c: cleanup asprintf, old function decls + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@189 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_mysql.c, plugins/check_real.c, plugins/check_ups.c: + remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@188 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-11 Subhendu Ghosh + + * plugins/check_snmp.c: should use asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@187 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: more snmpv3 patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@186 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: long opt for miblist, snmpv3 support (rosenauer) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@185 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: option to specify a miblist - llow + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@184 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: misc doc fix, missing verbose option + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@183 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-09 Karl DeBisschop + + * plugins/check_ups.c, plugins/check_users.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@182 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_ping.c, + plugins/check_time.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@181 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cleaner handling of DEFAULT_PORT + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@180 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: add HPUX swap, try to cleanup getopt processing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@179 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c, plugins/check_ping.c, plugins/check_snmp.c, + plugins/negate.c, plugins/utils.h.in: define and use usage3 where second + part of message is a an int/char + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@178 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/snprintf.c: HAVE_C99_SNPRINTF is not tested, so remove from + ifdef + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@177 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-08 Karl DeBisschop + + * plugins/check_snmp.c: user reports NULL still getting into asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@176 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_vsz.c: remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@175 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h, configure.in, plugins/common.h.in, plugins/utils.c, + plugins/utils.h.in: patches required to build on solaris with asprintf + and gettimeofday + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@174 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_load.c, plugins/check_ping.c, + plugins/check_procs.c, plugins/check_smtp.c, plugins/check_tcp.c: remove + unused variables + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@173 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/oneliners: some useful onliners + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@172 f882894a-f735-0410-b71e-b25c423dba1c + +2002-11-07 Karl DeBisschop + + * plugins/check_snmp.c: bugfixes to command format and (null) text + created by asprintf switch + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@171 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: remove call_getopt, add [] arougn time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@170 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: test snprintf function family for ifdefs in snprintf.c + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@169 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-30 Karl DeBisschop + + * plugins/check_tcp.c: replace fixed-lentgh buffer with asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@168 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_udp.c: forgot to remove call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@167 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ssh.c, plugins/check_swap.c: forgot to remove + call_getopt declaration + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@166 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: remove call_getopt, fix several buffer overruns + possible due to use of fixed size buffers + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@165 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/setup: debian builds not actively maintained, so suppress error + in setup script + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@164 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-30 Subhendu Ghosh + + * acconfig.h, configure.in, plugins-scripts/Makefile.am, + plugins-scripts/check_mailq.pl, plugins-scripts/utils.pm.in: monitor + mailq + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@163 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-28 Karl DeBisschop + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_log.sh, + plugins-scripts/check_ntp.pl, plugins-scripts/check_rpc.pl, + plugins-scripts/check_sensors.sh, plugins-scripts/check_wave.pl: remove + pspace in shebang since no sequent users replied + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@162 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-26 Karl DeBisschop + + * nagios-plugins.spec.in: release should not be in tarball name + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@161 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-25 Karl DeBisschop + + * nagios-plugins.spec.in: tweak source macro + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@160 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: remove check_nt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@159 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, plugins/Makefile.am: include getloadavg sources, add some + Solaris pkg build support + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@158 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-22 Karl DeBisschop + + * plugins/check_ssh.c: remove call_getopt, replace ssprintf with + asprintf,better server version reporting + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@157 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: add check_spop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@156 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_procs.c: remove call_getopt, replace ssprintf with + asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@155 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-22 Subhendu Ghosh + + * contrib/check_procr.sh: From: Jerome Tytgat - checks to see if named + process is running + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@154 f882894a-f735-0410-b71e-b25c423dba1c + + * README, plugins/check_nt.c: check_nt is downloadable from + nsclient.ready2run.nl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@153 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-21 Karl DeBisschop + + * plugins/check_swap.c: use asprintf instead of ssprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@152 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: need to define SOURCES for check_tcp to also + build as check_ftp,check_imap,check_nntp,check_pop + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@151 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use asprintf to do strscpy + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@150 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/Makefile.am: roll check_ftp, check_imap, check_pop, and + check_nntp into check_tcp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@149 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ftp.c, plugins/check_imap.c, plugins/check_nntp.c, + plugins/check_pop.c: these are all combined into check_tcp now + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@148 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: remove broken call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@147 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: cleanup process_arguments, print_help, and + print_usage + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@146 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_pgsql.c: now we provide long opts if they do not exist + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@145 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-20 Karl DeBisschop + + * plugins/check_snmp.c: fixed scanning for multiple OIDs, which was not + working + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@144 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: change ssprintf to asprintf + back out change at line 225 in r1.4 + (values were mismatched to format string, so output was nonsense) + (I left a comment showing a construct that should work, but it fails for PHBs: + if my disk gets nearly full, they want 'CRITICAL - 99%' not 'CRITICAL - Gauge32: 99') + (If someine has a rationale for the change, maybe it could be done as an option? - it seems + fairly clear that the Web display should be sensible to PHBs so long as there's no real loss) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@143 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-18 Karl DeBisschop + + * plugins/check_swap.c: remove old call_getopt + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@142 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_load.c: remove old call_getopt code, fix bug taking + single float, allow colon as separators in additin to commas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@141 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: handle null src in strscat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@140 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_tcp.c: millisecond timing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@139 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.h.in: refine STD_LONG_OPTS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@138 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: provide on more decimal point printing time + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@137 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_ping.c: remove broken call_getopt stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@136 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-17 Karl DeBisschop + + * plugins/check_tcp.c: using asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@135 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALL, INSTALLING, tools/setup: revise now that aclocal is remved + from CVS + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@134 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-16 Karl DeBisschop + + * configure.in: need some quoting on ifdef + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@133 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4, configure.in: finally a working fix for + AM/AC_FUNC_STRTOD nightmare + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@132 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: mismatched quote + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@131 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: mismatched quote + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@130 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: missing commas + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@129 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: complains on paren in comment + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@128 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4: lost a paren + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@127 f882894a-f735-0410-b71e-b25c423dba1c + + * acinclude.m4: old auto???? has AM_FUNC_STRTOD, now renamed + AC_FUNC_STRTOD + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@126 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/utils.c, plugins/utils.h.in: millisecond + timimg where supported + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@125 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, missing: build cleanly on RedHat 8.0 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@124 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore: ignore aclocal.m4 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@123 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: AM_STRTOD was a typo + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@122 f882894a-f735-0410-b71e-b25c423dba1c + + * aclocal.m4: automake invokes acloacl on each run - it cannot be right + to include this + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@121 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h: better checks for vsnprintf stuff + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@120 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins/check_http.c: use asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@119 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: use asprintf to construct strscat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@118 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/popen.h.in: timeout interval is extern + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@117 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c, plugins/utils.h.in: start support for gettimeofday + and tv_usec + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@116 f882894a-f735-0410-b71e-b25c423dba1c + + * aclocal.m4: generated with automake 1.6 / autoconf 2.53 (maybe should + not be in CVS, however) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@115 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/snprintf.c: newer snprintf from samba.org + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@114 f882894a-f735-0410-b71e-b25c423dba1c + + * .cvsignore, depcomp: needed for automake 1.6 / autoconf 2.53 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@113 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am: cosmetic line wrap before 80 chars + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@112 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: work with newer automake, begin swithc to asprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@111 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-15 Subhendu Ghosh + + * plugins-scripts/check_ifoperstatus.pl: new exit states, more + conditional checking + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@110 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-07 Subhendu Ghosh + + * plugins/check_dns.c: patch for expected IP address + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@109 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-07 Karl DeBisschop + + * plugins/popen.c: make sure we do not run past the end of an + unterminated string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@108 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/negate.c: use asprintf, inhibit splint warning + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@107 f882894a-f735-0410-b71e-b25c423dba1c + +2002-10-05 Karl DeBisschop + + * getloadavg.m4, plugins/getloadavg.c: lets use library instead od + inconsistent command line interfaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@106 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-26 Karl DeBisschop + + * plugins/urlize.c: use ssprintf instead of sprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@105 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-25 Karl DeBisschop + + * plugins/check_http.c: incorporate comment on my_recv from Russell + Scibetti + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@104 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c: incorporate comments from Russell Scibetti + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@103 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-24 Karl DeBisschop + + * plugins/check_http.c: replace remaining occurences of sprintf with + snprintf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@102 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-16 Karl DeBisschop + + * INSTALL: needed for latest autoconf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@101 f882894a-f735-0410-b71e-b25c423dba1c + + * Makefile.am, aclocal.m4, configure.in, nagios-plugins.spec.in: finish + ckleanup of rpm spec porcessing + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@100 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-14 Karl DeBisschop + + * nagios-plugins.spec.in: complete spec based on confugure.in + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@99 f882894a-f735-0410-b71e-b25c423dba1c + + * make-tarball, rpm: automake makes the dist tarball, rpmbuild -ta makes + the rpm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@98 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_http.c, plugins/check_tcp.c: time data in performance + string + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@97 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_log.sh: patch from Matthew Peters + , plus turned up a few bugs on my own + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@96 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-12 Karl DeBisschop + + * plugins/Makefile.am: negate wrapper + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@95 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-08 Karl DeBisschop + + * plugins/negate.c: wrapper to invert return status + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@94 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/utils.c: clears up warnings in splint + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@93 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-06 Karl DeBisschop + + * plugins-scripts/check_rpc.pl: case on key to ERRORS hash + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@92 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-04 Subhendu Ghosh + + * configure.in: more Mysql patches + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@91 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: dispersion check now controlled by warn + and crit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@90 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: Mysql dir fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@89 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl: moved to + supported plugins-scripts + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@88 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-02 Subhendu Ghosh + + * plugins/check_smtp.c: new -f option for adding a FROM address for RFC + correctness + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@87 f882894a-f735-0410-b71e-b25c423dba1c + +2002-09-01 Subhendu Ghosh + + * INSTALLING: file rename for MacOS X + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@86 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: Valid MAIL command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@85 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-22 Subhendu Ghosh + + * contrib/check_snmp_process_monitor.pl: updates + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@84 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: smsclient config + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@83 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_snmp_disk_monitor.pl, + contrib/check_snmp_process_monitor.pl: new plugins contrib + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@82 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-18 Karl DeBisschop + + * plugins/check_by_ssh.c: typo in options passed to ssh for ipv6. + fix by setting a generic hook for 1-char pasthhru options + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@81 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-14 Subhendu Ghosh + + * plugins-scripts/check_disk_smb.pl: patch for admin shares + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@80 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: qpage definitions + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@79 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ifstatus.pl: skip PPP interfaces + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@78 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_smtp.c: added HELO command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@77 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_by_ssh.c: ipv4/ipv6 switch added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@76 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c: net-snmp v5x fix + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@75 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_apc_ups.pl: fix for ePN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@74 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_linux_raid.pl, contrib/check_nagios_db.pl: new plugins + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@73 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_inodes-freebsd.pl: check inodes - freebsd - candidate + for merge with check_inodes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@72 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_smb.sh: new smb check - users + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@71 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-13 Ethan Galstad + + * plugins/check_game.c: Mod to display current/max number of players in + a game (Frank Kannemann) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@70 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-12 Ethan Galstad + + * contrib/check_disk_snmp.pl: Updated to use getopt (Christoph Maser) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@69 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-01 Subhendu Ghosh + + * plugins/check_snmp.c: re-patched exit state comparison + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@68 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: port option added, -c support net-snmpv5, + complete response string output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@67 f882894a-f735-0410-b71e-b25c423dba1c + +2002-08-01 Ethan Galstad + + * contrib/check_digitemp.pl: Add Brian Lane's Digitemp (1-wire temp + sensor) plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@66 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-16 Ethan Galstad + + * contrib/check_disk_snmp.pl: Christoph Maser's plugin to check disk + usage via SNMP3 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@65 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-16 Stanley Hopcroft + + * contrib/check_ms_spooler.pl: Primitive and in need of refinement test + of MS spooler (with smbclient) + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@64 f882894a-f735-0410-b71e-b25c423dba1c + +2002-07-04 Subhendu Ghosh + + * contrib/check_procl.sh: Jerome Tytgat - accumulated/percentage CPU/MEM + per process - bash plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@63 f882894a-f735-0410-b71e-b25c423dba1c + + * INSTALL: doc update + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@62 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-28 Subhendu Ghosh + + * INSTALL: note about autoconf/automake version + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@61 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-25 Subhendu Ghosh + + * contrib/check_rbl.c: Check if IP address is specified on RBL - Tim + Bell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@60 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_lmmon.pl: check motherboard/cpu temp via lmmon + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@59 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-24 Subhendu Ghosh + + * plugins/check_http.c: ignore return status codes if user specified + status line check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@58 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_snmp.c: printf bug for large numbers - Jeff Murray + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@57 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-20 Subhendu Ghosh + + * plugins-scripts/check_disk_smb.pl: logic fix for disk space thresholds + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@56 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-19 Subhendu Ghosh + + * plugins/check_dig.c, plugins/check_dns.c, plugins/check_fping.c, + plugins/check_hpjd.c, plugins/check_nagios.c, plugins/check_ping.c, + plugins/check_snmp.c, plugins/check_vsz.c, plugins/urlize.c, + plugins/utils.c, plugins/utils.h.in: more POSIX return value comparison + related code fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@55 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c, plugins/check_ping.c, plugins/check_procs.c: + fixes for using POSIX return codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@54 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-18 Subhendu Ghosh + + * plugins/common.h.in: updated to POSIX return codes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@53 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_cluster.c: Ethan's check_cluster + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@52 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-13 Subhendu Ghosh + + * plugins/check_smtp.c: conformance to RFC 821 + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@51 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: use xntpdc on Solaris for check_ntp + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@50 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-10 Subhendu Ghosh + + * plugins/check_smtp.c: patch to stop NOQUEUE syslog messages - Karl + Ewald + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@49 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-08 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: xntpdc/ntpdc patch - John Koyle + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@48 f882894a-f735-0410-b71e-b25c423dba1c + +2002-06-06 Subhendu Ghosh + + * plugins-scripts/subst.in, plugins-scripts/utils.sh.in: corrected + result codes - for sh; corrected substition for libexec - Tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@47 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_disk.c: added option for mount point - Tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@46 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_oracle.sh: Add test for Oracle name server, can + dynamicall determine ORACLE_HOME - tom Bertelson + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@45 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_flexlm.pl: conditional on lmstat + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@44 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: conditional on ntpdc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@43 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-29 Subhendu Ghosh + + * command.cfg.in: notes added + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@42 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-28 Subhendu Ghosh + + * command.cfg.in: option updates, more examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@41 f882894a-f735-0410-b71e-b25c423dba1c + + * command.cfg.in: option updates, more examples + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@40 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-27 Subhendu Ghosh + + * plugins-scripts/check_ntp.pl: checked in too quickly + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@39 f882894a-f735-0410-b71e-b25c423dba1c + + * doc/README, doc/developer-guidelines.html, + doc/developer-guidelines.sgml: added developer guidelines. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@38 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: typo, AIX 4.3 ps, smbclient, Net::SNMP fixes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@37 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h, plugins-scripts/utils.pm.in: new var - smbclient + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@36 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_ntp.pl: logic reorg, ePN fix and support for + utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@35 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_disk_smb.pl: ePN fix and support for utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@34 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-23 Subhendu Ghosh + + * contrib/check_log2.pl, contrib/check_vcs.pl: New plugins from Aaron + Bostick - Veritas Cluster, logfile + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@33 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-10 Subhendu Ghosh + + * plugins-scripts/check_rpc.pl: updates for ePN, patch for multiple + version check + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@32 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in, plugins-scripts/utils.pm.in: added programs to autoconf + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@31 f882894a-f735-0410-b71e-b25c423dba1c + + * acconfig.h: This commit was generated by cvs2svn to compensate for + changes in r29, + which included commits to RCS files with non-trunk default branches. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@30 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-09 Subhendu Ghosh + + * plugins-scripts/Makefile.am, plugins-scripts/check_ifoperstatus.pl: + migrated check_ifoperstatus to standard plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@28 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-08 Subhendu Ghosh + + * plugins/check_ping.c: patch for Suse 8.0 loss output + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@27 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/utils.pm.in: is_hostname added, update CODES to POSIX + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@26 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins/check_hpjd.c, plugins/check_ups.c: updated notes + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@25 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: updated messages and check for host command + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@24 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/Makefile.am, plugins-scripts/check_ifstatus.pl: moved + updated check_ifstatus to standard plugin + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@23 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-07 Subhendu Ghosh + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ircd.pl, plugins-scripts/check_netdns.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_wave.pl: 2nd fix for + ePN + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@22 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-02 Subhendu Ghosh + + * plugins-scripts/check_breeze.pl, plugins-scripts/check_disk_smb.pl, + plugins-scripts/check_flexlm.pl, plugins-scripts/check_ircd.pl, + plugins-scripts/check_netdns.pl, plugins-scripts/check_ntp.pl, + plugins-scripts/check_rpc.pl, plugins-scripts/check_wave.pl: fix for + embedded perl + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@21 f882894a-f735-0410-b71e-b25c423dba1c + + * tools/README, tools/mini_epn.c, tools/p1.pl: updated mini_epn and + p1.pl added to plugins distribution + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@20 f882894a-f735-0410-b71e-b25c423dba1c + +2002-05-01 Subhendu Ghosh + + * contrib/tarballs/fetchlog-0.92.tar.gz: remote log check (via snmp + possible) by Alexander Haderer + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@19 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-29 Karl DeBisschop + + * plugins/getopt.h: failed to carry over from old plugins, listed in + EXTRA_DIST, needed for build + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@18 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-23 Subhendu Ghosh + + * plugins/check_ping.c: corrected program name and added rtt patch for + RH7.2+beta + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@17 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-18 Ethan Galstad + + * contrib/check_inodes.pl: add check_inodes contrib plugin by John Jolet + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@16 f882894a-f735-0410-b71e-b25c423dba1c + + * configure.in: configure script patch for ping syntax + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@15 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-07 Subhendu Ghosh + + * contrib/check_backup.pl, contrib/check_dl_size.pl: plugins from + Patrick Greenwell + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@14 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-05 Subhendu Ghosh + + * acconfig.h: This commit was generated by cvs2svn to compensate for + changes in r12, + which included commits to RCS files with non-trunk default branches. + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@13 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/tarballs/check_spread.tar: plugin to check spread messaging + toolkit + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@11 f882894a-f735-0410-b71e-b25c423dba1c + +2002-04-03 Subhendu Ghosh + + * contrib/check_oracle_instance.pl: from Sven Dolderer - check oracle + instance + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@10 f882894a-f735-0410-b71e-b25c423dba1c + + * plugins-scripts/check_nfs.pl: check_nfs functionality exists in + check_rpc + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@9 f882894a-f735-0410-b71e-b25c423dba1c + +2002-03-18 Subhendu Ghosh + + * plugins-scripts/subst.in: function to update perl plugin scripts to + find utils.pm + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@8 f882894a-f735-0410-b71e-b25c423dba1c + +2002-03-01 Ethan Galstad + + * plugins/.cvsignore, plugins/config.h.in: Fix for stupid me + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@7 f882894a-f735-0410-b71e-b25c423dba1c + + * contrib/check_breeze.pl, contrib/check_dhcp.c, + contrib/check_flexlm.pl, contrib/check_hltherm.c, + contrib/check_hprsc.pl, contrib/check_ipxping.c, contrib/check_mysql.c, + contrib/check_uptime.c, contrib/check_wave.pl, contrib/readme.txt, + contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_breeze.tar.gz, + contrib/tarballs/check_flexlm.tar.gz, + contrib/tarballs/check_hltherm.tar.gz, + contrib/tarballs/check_hprsc.tar.gz, contrib/tarballs/check_memory.tgz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_wave.tar.gz, + contrib/tarballs/hopcroft-plugins.tar.gz, + contrib/tarballs/radius.tar.gz, plugins/.cvsignore, plugins/config.h.in: + Contrib plugin cleanup + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@6 f882894a-f735-0410-b71e-b25c423dba1c + +2002-02-28 Ethan Galstad + + * .cvsignore, AUTHORS, CODING, COPYING, ChangeLog, FAQ, Helper.pm, + INSTALL, LEGAL, Makefile.am, NEWS, README, REQUIREMENTS, ROADMAP, + Requirements, acconfig.h, aclocal.m4, command.cfg.in, configure.in, + contrib/aix/check_crit_dsk, contrib/aix/check_dsk, + contrib/aix/check_failed, contrib/aix/check_io, + contrib/aix/check_kerberos, contrib/aix/check_ping, + contrib/aix/check_queue, contrib/aix/pg_stat, contrib/check_apache.pl, + contrib/check_apc_ups.pl, contrib/check_bgpstate.pl, + contrib/check_dhcp.c, contrib/check_dlswcircuit.pl, + contrib/check_dns_random.pl, contrib/check_email_loop.pl, + contrib/check_fping_in.c, contrib/check_ftpget.pl, + contrib/check_ifoperstatus.pl, contrib/check_ifstatus.pl, + contrib/check_ipxping.c, contrib/check_joy.sh, + contrib/check_maxchannels.pl, contrib/check_maxwanstate.pl, + contrib/check_mem.pl, contrib/check_memory.tgz, contrib/check_mysql.c, + contrib/check_mysql.pl, contrib/check_nagios.pl, + contrib/check_netapp.pl, contrib/check_nmap.py, contrib/check_nwstat.pl, + contrib/check_ora_table_space.pl, contrib/check_pop3.pl, + contrib/check_qmailq.pl, contrib/check_rrd_data.pl, + contrib/check_sap.sh, contrib/check_sockets.pl, contrib/check_timeout.c, + contrib/check_uptime.c, contrib/checkciscotemp.pl, + contrib/maser-oracle.pl, contrib/mrtgext.pl, contrib/readme.txt, + contrib/restrict.pl, contrib/tarballs/berger-ping.tar.gz, + contrib/tarballs/bowen-langley_plugins.tar.gz, + contrib/tarballs/check_bgp-1.0.tar.gz, + contrib/tarballs/check_breeze.tar.gz, + contrib/tarballs/check_flexlm.tar.gz, + contrib/tarballs/check_hltherm.tar.gz, + contrib/tarballs/check_hprsc.tar.gz, + contrib/tarballs/check_radius.tar.gz, + contrib/tarballs/check_wave.tar.gz, + contrib/tarballs/hopcroft-plugins.tar.gz, + contrib/tarballs/radius.tar.gz, contrib/urlize.pl, contrib/utils.py, + install-sh, make-tarball, missing, mkinstalldirs, nagios-plugins.spec, + opttest.pl, package.def, plugins-scripts/.cvsignore, + plugins-scripts/Makefile.am, plugins-scripts/check_breeze.pl, + plugins-scripts/check_disk_smb.pl, plugins-scripts/check_flexlm.pl, + plugins-scripts/check_ircd.pl, plugins-scripts/check_log.sh, + plugins-scripts/check_netdns.pl, plugins-scripts/check_nfs.pl, + plugins-scripts/check_ntp.pl, plugins-scripts/check_oracle.sh, + plugins-scripts/check_rpc.pl, plugins-scripts/check_sensors.sh, + plugins-scripts/check_wave.pl, plugins-scripts/subst.in, + plugins-scripts/t/check_rpc.t, plugins-scripts/utils.pm.in, + plugins-scripts/utils.sh.in, plugins/.cvsignore, plugins/Makefile.am, + plugins/check_by_ssh.c, plugins/check_dig.c, plugins/check_disk.c, + plugins/check_dns.c, plugins/check_dummy.c, plugins/check_fping.c, + plugins/check_ftp.c, plugins/check_game.c, plugins/check_hpjd.c, + plugins/check_http.c, plugins/check_ide-smart.c, plugins/check_imap.c, + plugins/check_ldap.c, plugins/check_load.c, plugins/check_mrtg.c, + plugins/check_mrtgtraf.c, plugins/check_mysql.c, plugins/check_nagios.c, + plugins/check_nntp.c, plugins/check_nt.c, plugins/check_nwstat.c, + plugins/check_overcr.c, plugins/check_pgsql.c, plugins/check_ping.c, + plugins/check_pop.c, plugins/check_procs.c, plugins/check_radius.c, + plugins/check_real.c, plugins/check_smtp.c, plugins/check_snmp.c, + plugins/check_ssh.c, plugins/check_swap.c, plugins/check_tcp.c, + plugins/check_time.c, plugins/check_udp.c, plugins/check_ups.c, + plugins/check_users.c, plugins/check_vsz.c, plugins/common.h.in, + plugins/getopt.c, plugins/getopt1.c, plugins/netutils.c, + plugins/netutils.h.in, plugins/popen.c, plugins/popen.h.in, + plugins/snprintf.c, plugins/t/check_disk.t, plugins/t/check_dns.t, + plugins/t/check_fping.t, plugins/t/check_ftp.t, plugins/t/check_hpjd.t, + plugins/t/check_http.t, plugins/t/check_imap.t, plugins/t/check_load.t, + plugins/t/check_mysql.t, plugins/t/check_ping.t, plugins/t/check_pop.t, + plugins/t/check_procs.t, plugins/t/check_smtp.t, plugins/t/check_snmp.t, + plugins/t/check_swap.t, plugins/t/check_tcp.t, plugins/t/check_time.t, + plugins/t/check_udp.t, plugins/t/check_users.t, plugins/t/check_vsz.t, + plugins/tests/check_disk, plugins/tests/check_dns, + plugins/tests/check_ftp, plugins/tests/check_hpjd, + plugins/tests/check_http, plugins/tests/check_load, + plugins/tests/check_ping, plugins/tests/check_procs, + plugins/tests/check_swap, plugins/tests/check_users, + plugins/tests/check_vsz, plugins/urlize.c, plugins/utils.c, + plugins/utils.h.in, plugins/version.h.in, rpm, subst.in, subst.sh, + test.pl.in, tools/setup, tools/tango: Initial revision + + + git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2 f882894a-f735-0410-b71e-b25c423dba1c + diff --git a/INSTALL b/INSTALL index a1e89e1..8865734 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, -Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software +Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,97 +12,96 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for + Briefly, the shell command './configure && make && make install' +should configure, build, and install this package. The following +more-detailed instructions are generic; see the 'README' file for instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented +'INSTALL' file but do not implement all of the features documented below. The lack of an optional feature in a given package is not necessarily a bug. More recommendations for GNU packages can be found in *note Makefile Conventions: (standards)Makefile Conventions. - The `configure' shell script attempts to guess correct values for + The 'configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that +those values to create a 'Makefile' in each directory of the package. +It may also create one or more '.h' files containing system-dependent +definitions. Finally, it creates a shell script 'config.status' that you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). +file 'config.log' containing compiler output (useful mainly for +debugging 'configure'). - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. + It can also use an optional file (typically called 'config.cache' and +enabled with '--cache-file=config.cache' or simply '-C') that saves the +results of its tests to speed up reconfiguring. Caching is disabled by +default to prevent problems with accidental use of stale cache files. If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can +to figure out how 'configure' could check whether to do them, and mail +diffs or instructions to the address given in the 'README' so they can be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you +some point 'config.cache' contains results you don't want to keep, you may remove or edit it. - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. + The file 'configure.ac' (or 'configure.in') is used to create +'configure' by a program called 'autoconf'. You need 'configure.ac' if +you want to change it or regenerate 'configure' using a newer version of +'autoconf'. The simplest way to compile this package is: - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + 1. 'cd' to the directory containing the package's source code and type + './configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints + Running 'configure' might take a while. While running, it prints some messages telling which features it is checking for. - 2. Type `make' to compile the package. + 2. Type 'make' to compile the package. - 3. Optionally, type `make check' to run any self-tests that come with + 3. Optionally, type 'make check' to run any self-tests that come with the package, generally using the just-built uninstalled binaries. - 4. Type `make install' to install the programs and any data files and + 4. Type 'make install' to install the programs and any data files and documentation. When installing into a prefix owned by root, it is recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root + user, and only the 'make install' phase executed with root privileges. - 5. Optionally, type `make installcheck' to repeat any self-tests, but + 5. Optionally, type 'make installcheck' to repeat any self-tests, but this time using the binaries in their final installed location. This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required + regular user, particularly if the prior 'make install' required root privileges, verifies that the installation completed correctly. 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly + source code directory by typing 'make clean'. To also remove the + files that 'configure' created (so you can compile the package for + a different kind of computer), type 'make distclean'. There is + also a 'make maintainer-clean' target, but that is intended mainly for the package's developers. If you use it, you may have to get all sorts of other programs in order to regenerate files that came with the distribution. - 7. Often, you can also type `make uninstall' to remove the installed + 7. Often, you can also type 'make uninstall' to remove the installed files again. In practice, not all packages have tested that uninstallation works correctly, even though it is required by the GNU Coding Standards. - 8. Some packages, particularly those that use Automake, provide `make + 8. Some packages, particularly those that use Automake, provide 'make distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. + targets like 'make install' and 'make uninstall' work correctly. This target is generally not run by end users. Compilers and Options ===================== Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' +the 'configure' script does not know about. Run './configure --help' for details on some of the pertinent environment variables. - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: + You can give 'configure' initial values for configuration parameters +by setting variables in the command line or in the environment. Here is +an example: ./configure CC=c99 CFLAGS=-g LIBS=-lposix @@ -113,21 +112,21 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you can use GNU 'make'. 'cd' to the directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. +the 'configure' script. 'configure' automatically checks for the source +code in the directory that 'configure' is in and in '..'. This is known +as a "VPATH" build. - With a non-GNU `make', it is safer to compile the package for one + With a non-GNU 'make', it is safer to compile the package for one architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before +installed the package for one architecture, use 'make distclean' before reconfiguring for another architecture. On MacOS X 10.5 and later systems, you can create libraries and executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like +"universal" binaries--by specifying multiple '-arch' options to the +compiler but only a single '-arch' option to the preprocessor. Like this: ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ @@ -136,105 +135,104 @@ this: This is not guaranteed to produce working output in all cases, you may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. +using the 'lipo' tool if you have problems. Installation Names ================== - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an + By default, 'make install' installs the package's commands under +'/usr/local/bin', include files under '/usr/local/include', etc. You +can specify an installation prefix other than '/usr/local' by giving +'configure' the option '--prefix=PREFIX', where PREFIX must be an absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses +pass the option '--exec-prefix=PREFIX' to 'configure', the package uses PREFIX as the prefix for installing programs and libraries. Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory +options like '--bindir=DIR' to specify different values for particular +kinds of files. Run 'configure --help' for a list of the directories +you can set and what kinds of files go in them. In general, the default +for these options is expressed in terms of '${prefix}', so that +specifying just '--prefix' will affect all of the other directory specifications that were not explicitly provided. The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or +correct locations to 'configure'; however, many packages provide one or both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without +'make install' command line to change installation locations without having to reconfigure or recompile. The first method involves providing an override variable for each -affected directory. For example, `make install +affected directory. For example, 'make install prefix=/alternate/directory' will choose an alternate location for all directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. +'${prefix}'. Any directories that were specified during 'configure', +but not in terms of '${prefix}', must each be overridden at install time +for the entire installation to be relocated. The approach of makefile +variable overrides for each directory variable is required by the GNU +Coding Standards, and ideally causes no recompilation. However, some +platforms have known limitations with the semantics of shared libraries +that end up requiring recompilation when using this method, particularly +noticeable in packages that use GNU Libtool. - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and + The second method involves providing the 'DESTDIR' variable. For +example, 'make install DESTDIR=/alternate/directory' will prepend +'/alternate/directory' before all installation names. The approach of +'DESTDIR' overrides is not required by the GNU Coding Standards, and does not work on platforms that have drive letters. On the other hand, it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. +when some directory options were not specified in terms of '${prefix}' +at 'configure' time. Optional Features ================= If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. +with an extra prefix or suffix on their names by giving 'configure' the +option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the + Some packages pay attention to '--enable-FEATURE' options to +'configure', where FEATURE indicates an optional part of the package. +They may also pay attention to '--with-PACKAGE' options, where PACKAGE +is something like 'gnu-as' or 'x' (for the X Window System). The +'README' should mention any '--enable-' and '--with-' options that the package recognizes. - For packages that use the X Window System, `configure' can usually + For packages that use the X Window System, 'configure' can usually find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. +you can use the 'configure' options '--x-includes=DIR' and +'--x-libraries=DIR' to specify their locations. Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure +execution of 'make' will be. For these packages, running './configure --enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure +overridden with 'make V=1'; while running './configure --disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. +overridden with 'make V=0'. Particular systems ================== - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in + On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC +is not installed, it is recommended to use the following options in order to use an ANSI C compiler: ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as -their prerequisites, which makes it generally unusable when shipped -generated files such as `configure' are involved. Use GNU `make' -instead. + HP-UX 'make' updates targets which have the same time stamps as their +prerequisites, which makes it generally unusable when shipped generated +files such as 'configure' are involved. Use GNU 'make' instead. On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try +parse its '' header file. The option '-nodtk' can be used as a +workaround. If GNU CC is not installed, it is therefore recommended to +try ./configure CC="cc" @@ -242,26 +240,26 @@ and if that doesn't work, try ./configure CC="cc -nodtk" - On Solaris, don't put `/usr/ucb' early in your `PATH'. This + On Solaris, don't put '/usr/ucb' early in your 'PATH'. This directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. +these programs are available in '/usr/bin'. So, if you need '/usr/ucb' +in your 'PATH', put it _after_ '/usr/bin'. - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: + On Haiku, software installed for all users goes in '/boot/common', +not '/usr/local'. It is recommended to use the following options: ./configure --prefix=/boot/common Specifying the System Type ========================== - There may be some features `configure' cannot figure out + There may be some features 'configure' cannot figure out automatically, but needs to determine by the type of machine the package will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints +_same_ architectures, 'configure' can figure that out, but if it prints a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: +'--build=TYPE' option. TYPE can either be a short name for the system +type, such as 'sun4', or a canonical name which has the form: CPU-COMPANY-SYSTEM @@ -270,101 +268,101 @@ where SYSTEM can have one of these forms: OS KERNEL-OS - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't + See the file 'config.sub' for the possible values of each field. If +'config.sub' isn't included in this package, then this package doesn't need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will +use the option '--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a platform different from the build platform, you should specify the "host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. +eventually be run) with '--host=TYPE'. Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. + If you want to set default values for 'configure' scripts to share, +you can create a site shell script called 'config.site' that gives +default values for variables like 'CC', 'cache_file', and 'prefix'. +'configure' looks for 'PREFIX/share/config.site' if it exists, then +'PREFIX/etc/config.site' if it exists. Or, you can set the +'CONFIG_SITE' environment variable to the location of the site script. +A warning: not all 'configure' scripts look for a site script. Defining Variables ================== Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run +environment passed to 'configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: +them in the 'configure' command line, using 'VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc -causes the specified `gcc' to be used as the C compiler (unless it is +causes the specified 'gcc' to be used as the C compiler (unless it is overridden in the site shell script). -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an +Autoconf limitation. Until the limitation is lifted, you can use this +workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash -`configure' Invocation +'configure' Invocation ====================== - `configure' recognizes the following options to control how it + 'configure' recognizes the following options to control how it operates. -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. +'--help' +'-h' + Print a summary of all of the options to 'configure', and exit. -`--help=short' -`--help=recursive' +'--help=short' +'--help=recursive' Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. + 'configure', and exit. The 'short' variant lists options used only + in the top level, while the 'recursive' variant lists options also + present in any nested packages. -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' +'--version' +'-V' + Print the version of Autoconf used to generate the 'configure' script, and exit. -`--cache-file=FILE' +'--cache-file=FILE' Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to + traditionally 'config.cache'. FILE defaults to '/dev/null' to disable caching. -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. +'--config-cache' +'-C' + Alias for '--cache-file=config.cache'. -`--quiet' -`--silent' -`-q' +'--quiet' +'--silent' +'-q' Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error + suppress all normal output, redirect it to '/dev/null' (any error messages will still be shown). -`--srcdir=DIR' +'--srcdir=DIR' Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. + 'configure' can determine that directory automatically. -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. +'--prefix=DIR' + Use DIR as the installation prefix. *note Installation Names:: for + more details, including other options available for fine-tuning the + installation locations. -`--no-create' -`-n' +'--no-create' +'-n' Run the configure checks, but stop before creating any output files. -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - +'configure' also accepts some other, not widely useful, options. Run +'configure --help' for more details. diff --git a/Makefile.in b/Makefile.in index cdf996f..fc21b0d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,15 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/test.pl.in $(top_srcdir)/configure \ - $(top_srcdir)/pkg/solaris/pkginfo.in ABOUT-NLS AUTHORS COPYING \ - ChangeLog INSTALL NEWS THANKS build-aux/compile \ - build-aux/config.guess build-aux/config.rpath \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing build-aux/mkinstalldirs \ - config.rpath mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -161,21 +189,36 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = test.pl pkg/solaris/pkginfo CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -183,12 +226,49 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir distdir-am dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/test.pl.in $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.rpath \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing \ + $(top_srcdir)/build-aux/mkinstalldirs \ + $(top_srcdir)/pkg/solaris/pkginfo.in ABOUT-NLS AUTHORS COPYING \ + ChangeLog INSTALL NEWS README THANKS build-aux/compile \ + build-aux/config.guess build-aux/config.rpath \ + build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ + build-aux/missing build-aux/mkinstalldirs config.rpath \ + mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -198,6 +278,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -225,6 +306,9 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -234,6 +318,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1359,6 +1444,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1402,15 +1488,14 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1423,8 +1508,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -1451,22 +1536,25 @@ distclean-libtool: -rm -f libtool config.lt # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1481,57 +1569,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1547,12 +1590,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1564,15 +1602,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1581,11 +1615,36 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -1653,41 +1712,47 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) + +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -1695,11 +1760,9 @@ dist dist-all: distdir distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -1707,24 +1770,27 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac - chmod -R a-w $(distdir); chmod u+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -1745,7 +1811,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1880,25 +1946,26 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # diff --git a/NEWS b/NEWS index 202e960..b674391 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,96 @@ This file documents the major additions and syntax changes between releases. +2.3.2 20th Oct 2022 + GENERAL + Use netcat-openbsd for debian explicitely (by @RincewindsHat #1704) + Replace egrep with grep -E (by @RincewindsHat #1791) + Use silent automake by default (by @RincewindsHat #1747) + + SINGLE PLUGINS + check_by_ssh: added option to exit with an warning, if there is output on STDERR (by @nafets #1301) + check_by_ssh: Add "-U" flag (#1123). (by @archiecobbs #1774) + check_by_ssh: Let ssh decide if a host is valid, enables usage of ssh .config file (by @RincewindsHat #1691) + check_curl: Add an option to check_curl to verify the peer certificate & host using the system CA's (by @bazzisoft #1669) + check_curl: fixed -ffollow for HTTP/2.0 (Fixes #1685): added major_version parsing to PicoHTTPParser (by @andreasbaumann #1742) + check_curl: fixes check_curl: "CRITICAL - Cannot retrieve certificate subject." (by @andreasbaumann #1689) + check_curl: fix if http header contains leading spaces (by @sni #1666) + check_curl: Update check_curl.c to display a specific human-readable error message where possible (by @bazzisoft #1668) + check_curl: verify certificates option should not force SSL to be used (by @bazzisoft #1688) + check_disk: Description for -M was the wrong way around (by @RincewindsHat #1746) + check_disk: Fixing the stuff that is broken on btrfs (by @waja #1388) + check_disk: Fix perfdata for big values for check disk (by @RincewindsHat #1714) + check_disk_smb: Add configfile feature (by @Napsty #1402) + check_disk_smb: Add timeout (by @cdruee #1770) + check_dns: Add --expect-nxdomain (by @Jonny007-MKD #1623) + check_dns: split multiple IP addresses passed in one -a argument (by @DerDakon #1649) + check_file_age: Make size parameter a little bit more intelligible (by @RincewindsHat #1730) + check_fping: Implements 'host-alive' mode (Closes. #1027) (by @waja #1740) + check_game: Update Url to qstat (by @RincewindsHat #1725) + check_http: changed 'STATE_CRITICAL' to 'STATE_WARNING' for infinite loop (by @xFuture603 #1690) + check_http: Increase regexp limit (by @hydrapolic #1566) + check_http: Support http redirect (by @waja #1449) + check_icmp: buffer offerflow (by @RincewindsHat #1733) + check_icmp: delay set_source_ip() until address_family is detected (by @ghciv6 #1735) + check_icmp: Fix "Invalid Argument" from sendmsg() under FreeBSD 13.1 and "setsockopt failed" for TTL setting (by @eriksejr #1771) + check_icmp: Fix pkt perfdata in check_host mode (by @sjoegren #1721) + check_ldap: Allows check_ldap to read password from environment variable (by @mullumaus #1724) + check_load: add LOAD prefix to load plugin (by @haraldj #1694) + check_load: Display total and scaled load values if check_load scales the values (by number of CPUs by @RincewindsHat #1778) + check_log: Missing oldlog now aborts check_log (by @RincewindsHat #1732) + check_mailq: Add mailq -C option for config dir or config file (by @leeclemens #1490) + check_mailq: Check mailq domain specific warnings (by @RincewindsHat #1731) + check_mailq: Fix regexp for nullmailer "mailq" output (by @darksoul42 #1493) + check_mysql: fix segfaults with mysql-connector-c #1562 (by @ghciv6 #1644) + check_pgsql: add --queryname parameter to check_pgsql (by @datamuc #1741) + check_ping: Do not show RTA if no connection was possible (by @RincewindsHat #1697) + check_ping: understang ping6 output from iputils package (by @glensc #1412) + check_proc: Fix check proc ps detection (by @sni #1712) + check_procs: exchange needle and haystack in strstr() for proper st… (by @wolfgangkarall #1654) + check_smtp: add -L flag to support LMTP (LHLO instead of HELO/EHLO). (by @ghen2 #1715) + check_snmp: Added option for null zero length string exit codes (by @FracKenA #1496) + check_snmp: fix performance thresholds when using multiple oids (by @sni #1722) + check_snmp fix segfaults (by @adrb #1589) + check_snmp: put the "c" (to mark a counter) after the perfdata value (by @lausser #1465) + check_swap: fix parsing swap values (by @sni #1780) + check_swap: Fix perfdata for check swap (by @RincewindsHat #1707) + check_swap: Fix unit for total in perfdata (by @RincewindsHat #1779) + check_swap: Handle cached swap (by @mdavranche #1642) + check_swap: Small fix to threshold validation and style (indentation) fixes (by @RincewindsHat #1723) + check_ups: Fix possible overflow in check_ups (by @phibos #1727) + check_uptime: Add option to report uptime in days instead of seconds (by @amotl #1750) + check_uptime: Fix/improve output message "Uptime is ..." (by @amotl #1751) + + MULTIPLE PLUGINS + check_http, check_curl: added --max-redirs=N option (feature #1684) (by @andreasbaumann #1744) + check_http, check_curl: Enhancement --continue-after-certificate (backport from nagios-plugins) (by @andreasbaumann #1762) + check_http, check_curl: Remove check_http and check_curl test which are somehow always failing (by @RincewindsHat #1777) + check_log, check_oracle, check_sensors: Several fixes shellcheck complaining about (by @waja #1459) + sslutils: use chain from client certificates (by @tobiaswiese #1664) + + NON FUNCTIONAL CHANGES + Trivial source code whitespace formatting fixes to standard. (by @ziesemer #1424) + docs: fix simple typo, conspicuosly -> conspicuously (by @timgates42 #1652) + Migrate to GitHub actions (by @jacobbaungard #1686) + Point to Icinga Exchange instead of dead Monitoring Exchange (by @RincewindsHat #1737) + github actions: fix check_users test case (by @sni #1713) + Add CodeQL checks (by @phibos #1682) + Fix some QL problems (by @RincewindsHat #1729) + Update CodeQL and update runner before installing (by @RincewindsHat #1775) + check_disk: Check disk compiler warnings (by @RincewindsHat #1758) + check_disk: Trivial printf fix and a little bit of code style (by @RincewindsHat #1695) + check_http: Docs: make -C obvious (by @stblassitude #1554) + check_ifoperstatus: Re-attach a comment to where it actually belongs (by @peternewman #1699) + check_ircd: Restrict the nickname length of the test user for check_ircd (by @RincewindsHat #1710) + check_load: Check load compiler warnings (by @RincewindsHat #1759) + check_log: Modernize check log (by @RincewindsHat #1692) + check_mailq: remove duplicate W=i/C=i args in check_mailq.pl (by @ichdasich #1755) + check_ntp: Check ntp remove unused variables (by @RincewindsHat #1781) + check_pgsql: Using snprintf which honors the buffers size and guarantees null temination. (Closes: #1601) (by @waja #1663) + check_procs: Fix double percentage sign in usage (by @RincewindsHat #1743) + check_sensors.sh: Make shellcheck happier (by @RincewindsHat #1679) + check_snmp: Fixed option description authpassword -> authpasswd + whitespaces (by @RincewindsHat #1676) + check_swap: Check swap compiler warnings (by @RincewindsHat #1756) + 2.3.1 10 April 2021 ENHANCEMENTS check_curl: Add an option to verify the peer certificate & host using the system CA's @@ -28,6 +119,7 @@ This file documents the major additions and syntax changes between releases. check_dns: Accept CIDR check_dns: allow unsorted addresses check_dns: allow forcing complete match of all addresses + check_dns: option to expect NXDOMAIN check_apt: add --only-critical switch check_apt: add -l/--list option to print packages check_file_age: add range checking @@ -543,4 +635,3 @@ This file documents the major additions and syntax changes between releases. check_swap % thresholds changed to measure amount free, instead of amount used check_disk syntax changes for -p, -m/-M, defaults to MB instead of kB check_procs -C expects no path for the command name - diff --git a/NP-VERSION-GEN b/NP-VERSION-GEN index f755911..9dadc5d 100755 --- a/NP-VERSION-GEN +++ b/NP-VERSION-GEN @@ -6,7 +6,7 @@ SRC_ROOT=`dirname $0` NPVF=NP-VERSION-FILE -DEF_VER=2.3.1 +DEF_VER=2.3.2 LF=' ' diff --git a/THANKS b/THANKS index 3879814..28aed57 100644 --- a/THANKS +++ b/THANKS @@ -2,14 +2,16 @@ This software is brought to you by the Monitoring Plugins Development Team. Howe there have been many contributors to this project. Everyone below has helped in raising bug reports, creating patches or contributing new plugins. -Diego Elio Pettenò -fabiodds -Elan Ruusamäe -Nicolai Søborg -Marc Sánchez dag rob?le -Matthias Hähnel +Aksel Sjögren +Marc Sánchez +Wolfgang Karall-Ahlborn Randy O'Meara +Elan Ruusamäe +Matthias Hähnel +Nicolai Søborg +fabiodds +Diego Elio Pettenò Oskar Ahner Lance Albertson David Alden @@ -20,8 +22,8 @@ Felipe Gustavo de Almeida Michael Almond Michael Anthon Bernd Apfel -Bernd Arnold Paula Arnold +Bernd Arnold Kondoros Attila Daniel Austin Karol Babioch @@ -77,16 +79,18 @@ Yannick Charton Stephane Chazelas Eric Chen Alwyn Cherrington +Lee Clemens Ben Clewett Jean-Claude Computing Lionel Cons -Garry Cook -Charlie Cook Ollie Cook +Charlie Cook +Garry Cook Luca Corti Greg Cox Jason Crawford David Croft +Ken D Robert Dale Vincent Danjean Rok Debevc @@ -109,6 +113,7 @@ Matthew Ericson Andreas Ericsson Heiti Ernits Ragnar Hojland Espinosa +Klaus Ethgen O'Shaughnessy Evans Merijn Evertse Karl Ewald @@ -119,9 +124,10 @@ Reuben Farrelly Mark Favas Duncan Ferguson Juan Carlos Fernandez -Paulo Fessel Paulo Afonso Graner Fessel +Paulo Fessel James Fidell +Tobias Fiebig Roman Fiedler Johan Fischer Bernhard Fischer @@ -137,8 +143,8 @@ Tim Gates Sven Geggus Jonas Genannt Robby Giffin -Flo Gleixner Florian Gleixner +Flo Gleixner Evgeni Golov Joseph Gooch Aravind Gottipati @@ -150,6 +156,7 @@ Alex Griffin Chris Grim Steven Grimm Sebastien Guay +Linda Guo Jon Hallett Steve Hanselman Jacob Hansen @@ -158,6 +165,7 @@ Sebastian Harl Michael Haro Olli Hauer Gunnar Hellekson +Geert Hendrickx Sebastian Herbszt Johannes Herlitz Ian Holsman @@ -196,6 +204,7 @@ Steven Kreuzer Julius Kriukas Christoph Kron Frederic Krueger +Claudio Kuenzler Marcel Kuiper Christian Kujau Alexander Kulak @@ -228,8 +237,8 @@ Pawel Malachowski Ricardo Maraschini Michael Markstaller John Marquart -Ernst-Dieter Martin Jason Martin +Ernst-Dieter Martin Christopher Maser Mathieu Masseboeuf Alexander Matey @@ -250,6 +259,7 @@ Jonathan Milby Russell Miller Eric J. Mislivec Janos Mohacsi +Andreas Motl Tomas Mozes Gerd Mueller Adrian Murphy @@ -257,6 +267,7 @@ Michael Musikhin Damian Myerscough Jan-Frode Myklebust Sivakumar Nellurandi +Peter Newman Truongchinh Nguyen Simon L Nielsen Thomas Nilsen @@ -353,6 +364,7 @@ Julien Touche Gabriele Tozzi Kyle Tucker Jerome Tytgat +Daniel Uhlmann Stéphane Urbanovski Matthias Urlichs Matteo HCE Valsasna @@ -378,6 +390,7 @@ Torsten Werner Ben Whaley Andrew Widdersheim Adrian Wieczorek +Tobias Wiese Sebastian Wiesinger Paul Wiggins Howard Wilkinson @@ -387,6 +400,7 @@ Mario Witte Alexander Wittig Tobias Wolf Brian De Wolf +Eric Wunderlin Patric Wust Jamie Zawinski Vadim Zhukov diff --git a/aclocal.m4 b/aclocal.m4 index e4a2f42..0de63cc 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.6 -*- Autoconf -*- +# generated automatically by aclocal 1.16.3 -*- Autoconf -*- + +# Copyright (C) 1996-2020 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,33 +11,31 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.6], [], +m4_if([$1], [1.16.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.6])dnl +[AM_AUTOMAKE_VERSION([1.16.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -108,30 +103,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -150,16 +141,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -169,7 +158,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -182,12 +171,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -195,8 +185,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -236,16 +226,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -254,8 +244,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -263,7 +253,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -311,7 +301,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -321,9 +311,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -338,67 +332,56 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -407,29 +390,31 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -442,7 +427,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -471,33 +456,42 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -506,34 +500,82 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -555,21 +597,18 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -577,16 +616,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -603,20 +640,17 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -627,10 +661,11 @@ AC_DEFUN([AM_MAINTAINER_MODE], AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -638,106 +673,57 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -745,71 +731,33 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -819,7 +767,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -833,24 +781,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -861,32 +867,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -896,46 +910,118 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2020 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -949,18 +1035,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -970,76 +1054,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - # tar/untar a dummy directory, and stop if the command works + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/build-aux/compile b/build-aux/compile index 862a14e..23fcba0 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -18,7 +17,7 @@ scriptversion=2012-03-05.13; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -54,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -68,7 +67,7 @@ func_file_conv () mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -113,6 +112,11 @@ func_cl_dashl () lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS @@ -251,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -335,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/config.guess b/build-aux/config.guess index d622a44..f50dcdb 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,24 +15,22 @@ timestamp='2012-02-10' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# +# Please send patches to . + me=`echo "$0" | sed -e 's,.*/,,'` @@ -43,7 +39,7 @@ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -113,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -138,9 +132,37 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "$UNAME_SYSTEM" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi + ;; +esac + # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -153,21 +175,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ + echo unknown)` + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown + ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -182,40 +214,67 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case "$UNAME_MACHINE_ARCH" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "$machine-${os}${release}${abi}" + exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; + *:Sortix:*:*) + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -232,63 +291,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -300,9 +350,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -327,38 +377,38 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + eval "$set_cc_for_build" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -367,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -396,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -442,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -484,17 +534,17 @@ EOF AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -511,7 +561,7 @@ EOF echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -523,14 +573,14 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -541,7 +591,7 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -555,26 +605,27 @@ EOF exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -589,28 +640,28 @@ EOF echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + case "$sc_cpu_version" in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + case "$sc_kernel_bits" in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -643,13 +694,13 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -660,23 +711,23 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -701,11 +752,11 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -714,7 +765,7 @@ EOF *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -722,9 +773,9 @@ EOF exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -749,124 +800,109 @@ EOF echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin + exit ;; + *:MINGW64*:*) + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + *:MSYS*:*) + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,63 +915,64 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" + exit ;; + e2k:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + k1om:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -949,55 +986,74 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + openrisc*:Linux:*:*) + echo or1k-unknown-linux-"$LIBC" + exit ;; + or32:Linux:*:* | or1k*:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-"$LIBC" + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-"$LIBC" + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1011,34 +1067,34 @@ EOF # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1048,12 +1104,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1063,9 +1119,9 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1073,7 +1129,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1085,9 +1141,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1107,9 +1163,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1118,28 +1174,28 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1150,7 +1206,7 @@ EOF *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1170,23 +1226,23 @@ EOF exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1201,66 +1257,97 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + eval "$set_cc_for_build" + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + NSE-*:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1269,18 +1356,18 @@ EOF echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1301,14 +1388,14 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1317,185 +1404,48 @@ EOF echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 +echo "$0: unable to guess system type" >&2 -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 </dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize +the system type. Please install a C compiler and try again. EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi + ;; +esac cat >&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1514,16 +1464,16 @@ hostinfo = `(hostinfo) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/config.sub b/build-aux/config.sub index 6205f84..1d8e98b 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,36 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2012-04-18' +timestamp='2018-02-22' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -38,7 +33,7 @@ timestamp='2012-04-18' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -58,12 +53,11 @@ timestamp='2012-04-18' me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -73,9 +67,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -102,7 +94,7 @@ while test $# -gt 0 ; do *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -120,24 +112,24 @@ esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; android-linux) os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -156,7 +148,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -186,44 +178,44 @@ case $os in ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -235,10 +227,7 @@ case $os in os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -259,21 +248,25 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ - | epiphany \ - | fido | fr30 | frv \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -287,26 +280,30 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ @@ -314,7 +311,8 @@ case $basic_machine in | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ + | visium \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -328,11 +326,14 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; ms1) basic_machine=mt-unknown @@ -361,7 +362,7 @@ case $basic_machine in ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -370,26 +371,29 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ + | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -403,28 +407,34 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ + | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ @@ -432,6 +442,8 @@ case $basic_machine in | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -445,7 +457,7 @@ case $basic_machine in # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -479,7 +491,7 @@ case $basic_machine in basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -508,6 +520,9 @@ case $basic_machine in basic_machine=i386-pc os=-aros ;; + asmjs) + basic_machine=asmjs-unknown + ;; aux) basic_machine=m68k-apple os=-aux @@ -521,7 +536,7 @@ case $basic_machine in os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -529,13 +544,13 @@ case $basic_machine in os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -624,10 +639,18 @@ case $basic_machine in basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -717,9 +740,6 @@ case $basic_machine in hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -732,26 +752,26 @@ case $basic_machine in basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -769,17 +789,17 @@ case $basic_machine in basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -788,11 +808,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -807,10 +831,10 @@ case $basic_machine in os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -820,15 +844,19 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -867,7 +895,7 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -912,6 +940,12 @@ case $basic_machine in nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -944,7 +978,7 @@ case $basic_machine in os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -960,7 +994,7 @@ case $basic_machine in basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -975,16 +1009,16 @@ case $basic_machine in basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -994,23 +1028,23 @@ case $basic_machine in ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1019,7 +1053,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1060,17 +1098,10 @@ case $basic_machine in sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1089,7 +1120,7 @@ case $basic_machine in os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1211,6 +1242,9 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1219,20 +1253,12 @@ case $basic_machine in basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1261,10 +1287,6 @@ case $basic_machine in vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1274,9 +1296,6 @@ case $basic_machine in sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1296,7 +1315,7 @@ case $basic_machine in # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1304,10 +1323,10 @@ esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1318,8 +1337,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases that might get confused + # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux @@ -1330,45 +1349,48 @@ case $os in -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1385,12 +1407,12 @@ case $os in -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1399,10 +1421,10 @@ case $os in os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1413,12 +1435,6 @@ case $os in -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1443,7 +1459,7 @@ case $os in -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1465,7 +1481,7 @@ case $os in -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1480,35 +1496,38 @@ case $os in -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; + -ios) + ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1543,6 +1562,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1595,12 +1617,12 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1640,7 +1662,7 @@ case $basic_machine in m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1655,9 +1677,6 @@ case $basic_machine in i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1767,15 +1786,15 @@ case $basic_machine in vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/build-aux/depcomp b/build-aux/depcomp index 25a39e6..6b39162 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,7 +16,7 @@ scriptversion=2012-03-27.16; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -28,9 +27,9 @@ scriptversion=2012-03-27.16; # UTC case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ gcc) ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ sgi) # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ aix) # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" + aix_post_process_depfile ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). "$@" -MD -MF "$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" + rm -f "$tmpdepfile" + ;; + +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output + # foo.o: sub/foo.c sub/foo.h + # and will wrap long lines using '\' : + # foo.o: sub/foo.c ... \ + # sub/foo.h ... \ + # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -473,6 +552,7 @@ $ { G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -524,13 +604,14 @@ dashmstdout) # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +740,15 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | @@ -700,9 +783,9 @@ exit 0 # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/install-sh b/build-aux/install-sh index a9244eb..ec298b5 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,25 +35,21 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,46 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + + -p) cpprog="$cpprog -p";; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -190,7 +206,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,11 +218,20 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -240,7 +265,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -250,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -266,178 +295,148 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else - mkdir_mode= + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -450,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -472,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -493,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -519,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/missing b/build-aux/missing index 86a8fc3..8d0eaad 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +17,7 @@ scriptversion=2012-01-06.13; # UTC # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; + + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,233 +70,146 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` +# Run the given program, remember its exit status. +"$@"; st=$? -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi + +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/mkinstalldirs b/build-aux/mkinstalldirs index 4191a45..c364f3d 100755 --- a/build-aux/mkinstalldirs +++ b/build-aux/mkinstalldirs @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2009-04-28.21; # UTC +scriptversion=2020-07-26.22; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -81,9 +81,9 @@ case $dirmode in echo "mkdir -p -- $*" exec mkdir -p -- "$@" else - # On NextStep and OpenStep, the `mkdir' command does not + # On NextStep and OpenStep, the 'mkdir' command does not # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already + # directories to create, and then abort because '.' already # exists. test -d ./-p && rmdir ./-p test -d ./--version && rmdir ./--version @@ -92,6 +92,8 @@ case $dirmode in *) if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "umask 22" + umask 22 echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" else @@ -104,6 +106,9 @@ case $dirmode in ;; esac +echo "umask 22" +umask 22 + for file do case $file in @@ -132,21 +137,16 @@ do if test ! -d "$pathcomp"; then errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi fi fi pathcomp=$pathcomp/ done + + if test ! -z "$dirmode"; then + echo "chmod $dirmode $file" + chmod "$dirmode" "$file" || errstatus=$? + fi done exit $errstatus @@ -154,9 +154,9 @@ exit $errstatus # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 0000000..9759384 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,150 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2018-03-07.03; # UTC + +# Copyright (C) 2011-2020 Free Software Foundation, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? + +if test $enable_hard_errors = no && test $estatus -eq 99; then + tweaked_estatus=1 +else + tweaked_estatus=$estatus +fi + +case $tweaked_estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC0" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.h.in b/config.h.in index 3e3d15b..5266560 100644 --- a/config.h.in +++ b/config.h.in @@ -1889,9 +1889,6 @@ /* Define if gettimeofday is needed */ #undef NEED_GETTIMEOFDAY -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Enable INI file parsing. */ #undef NP_EXTRA_OPTS diff --git a/configure b/configure index a54432c..a492338 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.1. +# Generated by GNU Autoconf 2.69 for monitoring-plugins 2.3.2. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='monitoring-plugins' PACKAGE_TARNAME='monitoring-plugins' -PACKAGE_VERSION='2.3.1' -PACKAGE_STRING='monitoring-plugins 2.3.1' +PACKAGE_VERSION='2.3.2' +PACKAGE_STRING='monitoring-plugins 2.3.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1721,7 +1721,6 @@ am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE -am__quote am__include DEPDIR OBJEXT @@ -1744,6 +1743,10 @@ build MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -1786,6 +1789,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1804,10 +1808,12 @@ PACKAGE_VERSION PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL' +SHELL +am__quote' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode with_nagios_user with_nagios_group @@ -1915,6 +1921,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -2167,6 +2174,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -2304,7 +2320,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -2417,7 +2433,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures monitoring-plugins 2.3.1 to adapt to many kinds of systems. +\`configure' configures monitoring-plugins 2.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2457,6 +2473,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2488,7 +2505,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of monitoring-plugins 2.3.1:";; + short | recursive ) echo "Configuration of monitoring-plugins 2.3.2:";; esac cat <<\_ACEOF @@ -2496,10 +2513,15 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-maintainer-mode disable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --disable-maintainer-mode + disable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-largefile omit support for large files --enable-threads={posix|solaris|pth|windows} specify multithreading API @@ -2659,7 +2681,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -monitoring-plugins configure 2.3.1 +monitoring-plugins configure 2.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3364,7 +3386,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by monitoring-plugins $as_me 2.3.1, which was +It was created by monitoring-plugins $as_me 2.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3797,7 +3819,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.11' +am__api_version='1.16' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3894,9 +3916,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -3907,32 +3926,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -3944,6 +3971,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -3954,27 +3991,22 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3983,10 +4015,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -4125,12 +4157,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -4213,6 +4239,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4235,7 +4300,7 @@ fi # Define the identity of the package. PACKAGE='monitoring-plugins' - VERSION='2.3.1' + VERSION='2.3.2' cat >>confdefs.h <<_ACEOF @@ -4263,12 +4328,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -4276,6 +4351,88 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -5194,49 +5351,108 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" - -am_make=${MAKE-make} -cat > confinc << 'END' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 +$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 + (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + case $?:`cat confinc.out 2>/dev/null` in #( + '0:this is the am__doit target') : + case $s in #( + BSD) : + am__include='.include' am__quote='"' ;; #( + *) : + am__include='include' am__quote='' ;; +esac ;; #( + *) : ;; - esac -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +esac + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 +$as_echo "${_am_result}" >&6; } # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -5269,8 +5485,8 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -5305,16 +5521,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5323,8 +5539,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5332,7 +5548,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5893,131 +6109,6 @@ fi fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -13796,20 +13887,6 @@ CC="$lt_save_CC" -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5 @@ -16293,7 +16370,7 @@ fi - if $PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null + if $PATH_TO_WHO -q 2>/dev/null | grep -E -i "^# users=[0-9]+$" >/dev/null then ac_cv_path_to_who="$PATH_TO_WHO -q" else @@ -17462,8 +17539,18 @@ fi fi +elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ + grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND" > /dev/null +then + ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" + ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" + ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n" + ac_cv_ps_cols=10 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 +$as_echo "$ac_cv_ps_command" >&6; } + elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -17473,7 +17560,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null + grep -E -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -17483,7 +17570,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ - egrep -i "^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND" > /dev/null + grep -E -i "^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND" > /dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'" @@ -17493,7 +17580,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ - egrep -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+" >/dev/null + grep -E -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'" @@ -17503,7 +17590,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \ - egrep -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID" >/dev/null + grep -E -i "^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'" @@ -17513,7 +17600,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'" @@ -17523,7 +17610,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -laxnwww 2>/dev/null | head -1 | \ - egrep -i "^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND" >/dev/null + grep -E -i "^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND" >/dev/null then ac_cv_ps_varlist="&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS -laxnwww" @@ -17533,7 +17620,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps laxnwww 2>/dev/null | \ - egrep -i "^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND" >/dev/null + grep -E -i "^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND" >/dev/null then ac_cv_ps_varlist="&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS laxnwww" @@ -17543,7 +17630,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null + grep -E -i "^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -17553,7 +17640,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \ - egrep -i "^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+" > /dev/null + grep -E -i "^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+" > /dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos" ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'" @@ -17563,7 +17650,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i "^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'" @@ -17573,7 +17660,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \ - egrep -i "^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null + grep -E -i "^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'" @@ -17583,7 +17670,7 @@ then $as_echo "$ac_cv_ps_command - with no RSS" >&6; } elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'" @@ -17595,7 +17682,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'" @@ -17605,7 +17692,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'" @@ -17615,7 +17702,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \ - egrep -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null + grep -E -i "^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'" @@ -17625,7 +17712,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ - egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null + grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" @@ -17635,7 +17722,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ - egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null + grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" @@ -17645,7 +17732,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \ - egrep -i "^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null + grep -E -i "^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos" ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'" @@ -17655,7 +17742,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -el 2>/dev/null | \ - egrep -i "^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null + grep -E -i "^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" @@ -17665,7 +17752,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps glaxen 2>/dev/null | \ - egrep -i "^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND" >/dev/null + grep -E -i "^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND" >/dev/null then ac_cv_ps_varlist="&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS glaxen" @@ -17675,7 +17762,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \ - egrep -i "^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND" >/dev/null + grep -E -i "^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND" >/dev/null then ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'" ac_cv_ps_varlist="procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos" @@ -17685,7 +17772,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -Al 2>/dev/null | \ - egrep -i "^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD" >/dev/null + grep -E -i "^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD" >/dev/null then ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&pos,procprog" ac_cv_ps_command="$PATH_TO_PS -Al" @@ -17852,7 +17939,7 @@ $as_echo "$with_ping_command" >&6; } elif [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes @@ -17860,7 +17947,7 @@ then $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then # check if -4 is supported - issue #1550 with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" @@ -17869,7 +17956,7 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes @@ -17878,7 +17965,7 @@ then $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes @@ -17886,7 +17973,7 @@ then $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes @@ -17894,35 +17981,35 @@ then $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n %s -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING %s -n %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s %s 56 %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping_command" >&5 $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" ac_cv_ping_packets_first=yes @@ -17930,7 +18017,7 @@ then $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes @@ -17998,7 +18085,7 @@ $as_echo "$with_ping6_command" >&6; } elif test "x$PATH_TO_PING6" != "x"; then if [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes @@ -18006,7 +18093,7 @@ elif test "x$PATH_TO_PING6" != "x"; then $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s" ac_cv_ping6_packets_first=yes @@ -18015,7 +18102,7 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes @@ -18023,7 +18110,7 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -18031,35 +18118,35 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n %s -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 %s -n %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes @@ -18067,7 +18154,7 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -18079,7 +18166,7 @@ $as_echo "$with_ping6_command" >&6; } elif test "x$PATH_TO_PING" != "x"; then if [ "z$ac_cv_uname_s" = "zUnixWare" ] && \ $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes @@ -18087,7 +18174,7 @@ elif test "x$PATH_TO_PING" != "x"; then $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes @@ -18095,7 +18182,7 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -18103,35 +18190,35 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_ping6_command" >&5 $as_echo "$with_ping6_command" >&6; } elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes @@ -18139,7 +18226,7 @@ $as_echo "$with_ping6_command" >&6; } $as_echo "$with_ping_command" >&6; } elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -19147,7 +19234,7 @@ then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAP -l" if $PATH_TO_SWAP -l 2>/dev/null | \ - egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ + grep -E -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ >/dev/null then ac_cv_swap_format=" %*d %*s %*d,%*d %*d %*d %f %f" @@ -19155,7 +19242,7 @@ then { $as_echo "$as_me:${as_lineno-$LINENO}: result: using IRIX format swap" >&5 $as_echo "using IRIX format swap" >&6; } - elif $PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null + elif $PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null then ac_cv_swap_format="%*s %*[0-9,-] %*d %f %f" ac_cv_swap_conv=2048 @@ -19212,12 +19299,12 @@ if (test -n "$PATH_TO_SWAPINFO") then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_SWAPINFO format" >&5 $as_echo_n "checking for $PATH_TO_SWAPINFO format... " >&6; } -if $PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null +if $PATH_TO_SWAPINFO -k 2>&1 | grep -E -i "^Device" >/dev/null then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAPINFO -k" - if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null + if $PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null then ac_cv_swap_format="%*s %f %*d %f" ac_cv_swap_conv=1024 @@ -19225,7 +19312,7 @@ then $as_echo "using FreeBSD format swapinfo" >&6; } fi -elif $PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null +elif $PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE" >/dev/null then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" @@ -19280,7 +19367,7 @@ if (test -n "$PATH_TO_LSPS") then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $PATH_TO_LSPS format" >&5 $as_echo_n "checking for $PATH_TO_LSPS format... " >&6; } -if $PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null +if $PATH_TO_LSPS -a 2>/dev/null | grep -E -i "^Page Space" > /dev/null then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_LSPS -a" @@ -21752,7 +21839,7 @@ else fi if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then - if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then + if echo $ac_cv_uname_r | grep -E "\.EL(smp)?$" >/dev/null 2>&1 ; then { $as_echo "$as_me:${as_lineno-$LINENO}: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&5 $as_echo "$as_me: See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time" >&6;} { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redhat spopen problem" >&5 @@ -41665,6 +41752,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -42176,7 +42271,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by monitoring-plugins $as_me 2.3.1, which was +This file was extended by monitoring-plugins $as_me 2.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -42242,7 +42337,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -monitoring-plugins config.status 2.3.1 +monitoring-plugins config.status 2.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -42361,7 +42456,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" +AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -43269,32 +43364,38 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + case $CONFIG_FILES in #( + *\'*) : + eval set x "$CONFIG_FILES" ;; #( + *) : + set x $CONFIG_FILES ;; #( + *) : + ;; +esac shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || -$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$mf" : 'X\(//\)[^/]' \| \ - X"$mf" : 'X\(//\)$' \| \ - X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`$as_dirname -- "$am_mf" || +$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$am_mf" : 'X\(//\)[^/]' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$am_mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -43312,55 +43413,50 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || -$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$file" : 'X\(//\)[^/]' \| \ - X"$file" : 'X\(//\)$' \| \ - X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + am_filepart=`$as_basename -- "$am_mf" || +$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ + X"$am_mf" : 'X\(//\)$' \| \ + X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$am_mf" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q } - /^X\(\/\/\)[^/].*/{ + /^X\/\(\/\/\)$/{ s//\1/ q } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ + /^X\/\(\/\).*/{ s//\1/ q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + { echo "$as_me:$LINENO: cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles" >&5 + (cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } || am_rc=$? done + if test $am_rc -ne 0; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking). +See \`config.log' for more details" "$LINENO" 5; } + fi + { am_dirpart=; unset am_dirpart;} + { am_filepart=; unset am_filepart;} + { am_mf=; unset am_mf;} + { am_rc=; unset am_rc;} + rm -f conftest-deps.mk } ;; "libtool":C) diff --git a/configure.ac b/configure.ac index c849e8e..1f57911 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(monitoring-plugins,2.3.1) +AC_INIT(monitoring-plugins,2.3.2) AC_CONFIG_SRCDIR(NPTest.pm) AC_CONFIG_FILES([gl/Makefile]) AC_CONFIG_AUX_DIR(build-aux) AM_INIT_AUTOMAKE([1.8.3]) +AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST @@ -426,7 +427,7 @@ if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no" then AC_PATH_PROG(PATH_TO_WHO,who) - if [$PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null] + if [$PATH_TO_WHO -q 2>/dev/null | grep -E -i "^# users=[0-9]+$" >/dev/null] then ac_cv_path_to_who="$PATH_TO_WHO -q" else @@ -775,7 +776,7 @@ dnl Removing this for the moment - Ton dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation dnl Limitation that command name is not available dnl elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \ -dnl egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null +dnl grep -E -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null dnl then dnl ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]" dnl ac_cv_ps_command="/usr/ucb/ps -alxwwn" @@ -783,10 +784,20 @@ dnl ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT dnl ac_cv_ps_cols=8 dnl AC_MSG_RESULT([$ac_cv_ps_command]) +dnl This one is the exact same test as the next one but includes etime +elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ + grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND"] > /dev/null +then + ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" + ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" + ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n" + ac_cv_ps_cols=10 + AC_MSG_RESULT([$ac_cv_ps_command]) + dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo. dnl so test for this first... elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null + grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -798,7 +809,7 @@ dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo dnl Should also work for FreeBSD 5.2.1 and 5.3 dnl STAT UCOMM VSZ RSS USER PPID COMMAND elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null + grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -810,7 +821,7 @@ dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. dnl Limitation: Only first 16 chars returned for ucomm field dnl Must come before ps -weo elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \ - egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null + grep -E -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'" @@ -820,7 +831,7 @@ then dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ - egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'" @@ -830,7 +841,7 @@ then dnl FreeBSD elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \ - egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null + grep -E -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'" @@ -840,7 +851,7 @@ then dnl BSD-like mode in RH 6.1 elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'" @@ -852,7 +863,7 @@ dnl SunOS 4.1.3: dnl F UID PID PPID CP PRI NI SZ RSS WCHAN STAT TT TIME COMMAND dnl Need the head -1 otherwise test will work because arguments are found elif ps -laxnwww 2>/dev/null | head -1 | \ - egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null + grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null then ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -laxnwww" @@ -865,7 +876,7 @@ dnl FLAGS UID PID PPID PRI NI SIZE RSS WCHAN STA TTY TIME COMMA dnl 100 0 1 0 0 0 776 76 c0131c8c S ffff 0:11 init [2] dnl elif ps laxnwww 2>/dev/null | \ - egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null + grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null then ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS laxnwww" @@ -875,7 +886,7 @@ then dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs) elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'" @@ -888,7 +899,7 @@ dnl Has /usr/bin/ps and /sbin/ps - force sbin version dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead dnl of 1500). Will need big changes to check_procs to support elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \ - egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null + grep -E -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]" ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'" @@ -897,7 +908,7 @@ then AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \ - egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'" @@ -907,7 +918,7 @@ then dnl AIX 4.3.3 and 5.1 do not have an rss field elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \ - egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null + grep -E -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'" @@ -917,7 +928,7 @@ then dnl Solaris 2.6 elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'" @@ -928,7 +939,7 @@ then AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'" @@ -937,7 +948,7 @@ then AC_MSG_RESULT([$ac_cv_ps_command]) elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \ - egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'" @@ -947,7 +958,7 @@ then dnl wonder who takes state instead of stat elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \ - egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'" @@ -957,7 +968,7 @@ then dnl IRIX 53 elif ps -el 2>/dev/null | \ - egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)" @@ -967,7 +978,7 @@ then dnl IRIX 63 elif ps -el 2>/dev/null | \ - egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)" @@ -980,7 +991,7 @@ dnl S UID RUID USER RUSER PID PPID VSZ %CPU COMMAND dnl S 0 400 root oracle 2805 1 12904 0.00 ora_dism_SEA1X ora_dism_SEA1X dnl S 400 400 oracle oracle 19261 1 126488 0.00 tnslsnr /u01/app/oracle/product/db/11.2.0.3/bin/tnslsnr LISTENER -inherit elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \ - egrep -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null + grep -E -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]" ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'" @@ -992,7 +1003,7 @@ dnl AIX 4.1: dnl F S UID PID PPID C PRI NI ADDR SZ RSS WCHAN TTY TIME CMD dnl 303 A 0 0 0 120 16 -- 1c07 20 24 - 0:45 swapper elif ps -el 2>/dev/null | \ - egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null + grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)" @@ -1002,7 +1013,7 @@ then dnl AIX? elif ps glaxen 2>/dev/null | \ - egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null + grep -E -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null then ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS glaxen" @@ -1016,7 +1027,7 @@ dnl Some truncation will happen in UCOMM column dnl STAT VSZ RSS UID PPID %CPU UCOMM COMMAND dnl Ss 52756 22496 501 1 6.9 Window Manager /System/Library/CoreServices/WindowServer -daemon elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \ - egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null + grep -E -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null then ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'" ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]" @@ -1026,7 +1037,7 @@ then dnl UnixWare elif ps -Al 2>/dev/null | \ - egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null + grep -E -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]" ac_cv_ps_command="$PATH_TO_PS -Al" @@ -1094,14 +1105,14 @@ then elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then # check if -4 is supported - issue #1550 with_ping_command="$PATH_TO_PING -4 -n -U -w %d -c %d %s" @@ -1109,7 +1120,7 @@ then ac_cv_ping_has_timeout=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s" ac_cv_ping_packets_first=yes @@ -1117,52 +1128,52 @@ then AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -U -c %d %s" ac_cv_ping_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n %s -c %d" AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING %s -n %d" AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s %s 56 %d" AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d" AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s" ac_cv_ping_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping_command="$PATH_TO_PING -n -c %d %s" ac_cv_ping_packets_first=yes @@ -1218,14 +1229,14 @@ elif [[ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]]; then elif test "x$PATH_TO_PING6" != "x"; then if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s" ac_cv_ping6_packets_first=yes @@ -1233,52 +1244,52 @@ elif test "x$PATH_TO_PING6" != "x"; then AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n %s -c %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 %s -n %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -1289,59 +1300,59 @@ elif test "x$PATH_TO_PING6" != "x"; then elif test "x$PATH_TO_PING" != "x"; then if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \ $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d" AC_MSG_RESULT([$with_ping6_command]) elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s" ac_cv_ping6_packets_first=yes AC_MSG_RESULT([$with_ping_command]) elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \ - egrep -i "^round-trip|^rtt" >/dev/null + grep -E -i "^round-trip|^rtt" >/dev/null then with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s" ac_cv_ping6_packets_first=yes @@ -1578,14 +1589,14 @@ then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAP -l" if [$PATH_TO_SWAP -l 2>/dev/null | \ - egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ + grep -E -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \ >/dev/null] then ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"] ac_cv_swap_conv=2048 AC_MSG_RESULT([using IRIX format swap]) - elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null] + elif [$PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null] then ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"] ac_cv_swap_conv=2048 @@ -1604,19 +1615,19 @@ AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo) if (test -n "$PATH_TO_SWAPINFO") then AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format]) -if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null] +if [$PATH_TO_SWAPINFO -k 2>&1 | grep -E -i "^Device" >/dev/null] then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAPINFO -k" - if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null] + if [$PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null] then ac_cv_swap_format=["%*s %f %*d %f"] ac_cv_swap_conv=1024 AC_MSG_RESULT([using FreeBSD format swapinfo]) fi -elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null] +elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE" >/dev/null] then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM" @@ -1631,7 +1642,7 @@ AC_PATH_PROG(PATH_TO_LSPS,lsps) if (test -n "$PATH_TO_LSPS") then AC_MSG_CHECKING([for $PATH_TO_LSPS format]) -if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null] +if [$PATH_TO_LSPS -a 2>/dev/null | grep -E -i "^Page Space" > /dev/null] then ac_cv_have_swap=yes ac_cv_swap_command="$PATH_TO_LSPS -a" @@ -1833,7 +1844,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround, [ac_cv_enable_redhat_pthread_workaround=$enableval], [ac_cv_enable_redhat_pthread_workaround=test]) if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then - if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then + if echo $ac_cv_uname_r | grep -E "\.EL(smp)?$" >/dev/null 2>&1 ; then AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html if this next part takes a long time]) AC_MSG_CHECKING(for redhat spopen problem) ( cd config_test && make && make test ) > /dev/null 2>&1 diff --git a/gl/Makefile.in b/gl/Makefile.in index 975db03..0219288 100644 --- a/gl/Makefile.in +++ b/gl/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,23 +40,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -76,8 +113,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = gl -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -180,11 +215,18 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) +LTLIBRARIES = $(noinst_LTLIBRARIES) +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libgnu_a_AR = $(AR) $(ARFLAGS) am__DEPENDENCIES_1 = am__dirstamp = $(am__leading_dot)dirstamp @@ -199,29 +241,93 @@ am_libgnu_a_OBJECTS = base64.$(OBJEXT) sha1.$(OBJEXT) \ wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \ xsize.$(OBJEXT) xstrndup.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) -LTLIBRARIES = $(noinst_LTLIBRARIES) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/asnprintf.Po ./$(DEPDIR)/asprintf.Po \ + ./$(DEPDIR)/base64.Po ./$(DEPDIR)/basename-lgpl.Po \ + ./$(DEPDIR)/basename.Po ./$(DEPDIR)/btowc.Po \ + ./$(DEPDIR)/dirname-lgpl.Po ./$(DEPDIR)/dirname.Po \ + ./$(DEPDIR)/error.Po ./$(DEPDIR)/exitfail.Po \ + ./$(DEPDIR)/fd-hook.Po ./$(DEPDIR)/float.Po \ + ./$(DEPDIR)/floor.Po ./$(DEPDIR)/floorf.Po \ + ./$(DEPDIR)/fsusage.Po ./$(DEPDIR)/full-read.Po \ + ./$(DEPDIR)/full-write.Po ./$(DEPDIR)/gai_strerror.Po \ + ./$(DEPDIR)/getaddrinfo.Po ./$(DEPDIR)/gethostname.Po \ + ./$(DEPDIR)/getloadavg.Po ./$(DEPDIR)/getopt.Po \ + ./$(DEPDIR)/getopt1.Po ./$(DEPDIR)/idpriv-droptemp.Po \ + ./$(DEPDIR)/inet_ntop.Po ./$(DEPDIR)/itold.Po \ + ./$(DEPDIR)/localcharset.Po ./$(DEPDIR)/localeconv.Po \ + ./$(DEPDIR)/malloc.Po ./$(DEPDIR)/malloca.Po \ + ./$(DEPDIR)/math.Po ./$(DEPDIR)/mbrtowc.Po \ + ./$(DEPDIR)/mbsinit.Po ./$(DEPDIR)/mbtowc.Po \ + ./$(DEPDIR)/memchr.Po ./$(DEPDIR)/mktime.Po \ + ./$(DEPDIR)/mountlist.Po ./$(DEPDIR)/msvc-inval.Po \ + ./$(DEPDIR)/msvc-nothrow.Po ./$(DEPDIR)/nl_langinfo.Po \ + ./$(DEPDIR)/printf-args.Po ./$(DEPDIR)/printf-parse.Po \ + ./$(DEPDIR)/read.Po ./$(DEPDIR)/regcomp.Po \ + ./$(DEPDIR)/regex.Po ./$(DEPDIR)/regex_internal.Po \ + ./$(DEPDIR)/regexec.Po ./$(DEPDIR)/safe-read.Po \ + ./$(DEPDIR)/setenv.Po ./$(DEPDIR)/sha1.Po \ + ./$(DEPDIR)/snprintf.Po ./$(DEPDIR)/sockets.Po \ + ./$(DEPDIR)/strcasecmp.Po ./$(DEPDIR)/strcasestr.Po \ + ./$(DEPDIR)/strerror-override.Po ./$(DEPDIR)/strerror.Po \ + ./$(DEPDIR)/stripslash.Po ./$(DEPDIR)/strncasecmp.Po \ + ./$(DEPDIR)/strndup.Po ./$(DEPDIR)/strnlen.Po \ + ./$(DEPDIR)/strsep.Po ./$(DEPDIR)/strstr.Po \ + ./$(DEPDIR)/sys_socket.Po ./$(DEPDIR)/time_r.Po \ + ./$(DEPDIR)/timegm.Po ./$(DEPDIR)/unistd.Po \ + ./$(DEPDIR)/unsetenv.Po ./$(DEPDIR)/vasnprintf.Po \ + ./$(DEPDIR)/vasprintf.Po ./$(DEPDIR)/vsnprintf.Po \ + ./$(DEPDIR)/wcrtomb.Po ./$(DEPDIR)/wctype-h.Po \ + ./$(DEPDIR)/xalloc-die.Po ./$(DEPDIR)/xmalloc.Po \ + ./$(DEPDIR)/xsize.Po ./$(DEPDIR)/xstrndup.Po \ + glthread/$(DEPDIR)/lock.Po glthread/$(DEPDIR)/threadlib.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) DIST_SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -230,12 +336,35 @@ am__can_run_installinfo = \ HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir distdir-am +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -267,6 +396,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1392,6 +1522,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1532,14 +1663,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits gl/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnits gl/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1553,6 +1683,17 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } glthread/$(am__dirstamp): @$(MKDIR_P) glthread @: > glthread/$(am__dirstamp) @@ -1563,130 +1704,127 @@ glthread/lock.$(OBJEXT): glthread/$(am__dirstamp) \ glthread/$(DEPDIR)/$(am__dirstamp) glthread/threadlib.$(OBJEXT): glthread/$(am__dirstamp) \ glthread/$(DEPDIR)/$(am__dirstamp) -libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) - -rm -f libgnu.a - $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) - $(RANLIB) libgnu.a -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done +libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) + $(AM_V_at)-rm -f libgnu.a + $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) + $(AM_V_at)$(RANLIB) libgnu.a mostlyclean-compile: -rm -f *.$(OBJEXT) - -rm -f glthread/lock.$(OBJEXT) - -rm -f glthread/threadlib.$(OBJEXT) + -rm -f glthread/*.$(OBJEXT) distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floorf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gai_strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gethostname.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getloadavg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idpriv-droptemp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strstr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_socket.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/lock.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/threadlib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basename.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/btowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-lgpl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fd-hook.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floor.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/floorf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fsusage.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-read.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/full-write.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gai_strerror.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getaddrinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gethostname.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getloadavg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/idpriv-droptemp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localcharset.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/localeconv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloca.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/math.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbrtowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbsinit.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbtowc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-inval.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvc-nothrow.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nl_langinfo.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regcomp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex_internal.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regexec.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/safe-read.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockets.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strsep.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strstr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sys_socket.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timegm.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vasprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsnprintf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcrtomb.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wctype-h.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xalloc-die.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xstrndup.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/lock.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@glthread/$(DEPDIR)/threadlib.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ +@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ @am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1695,22 +1833,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1725,57 +1866,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1791,12 +1887,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1808,15 +1899,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1825,11 +1912,29 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1892,7 +1997,8 @@ installdirs: installdirs-recursive installdirs-am: install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-recursive -install-exec: install-exec-recursive +install-exec: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -1934,7 +2040,84 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ clean-noinstLTLIBRARIES mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) glthread/$(DEPDIR) + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/asprintf.Po + -rm -f ./$(DEPDIR)/base64.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/basename.Po + -rm -f ./$(DEPDIR)/btowc.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dirname.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/floor.Po + -rm -f ./$(DEPDIR)/floorf.Po + -rm -f ./$(DEPDIR)/fsusage.Po + -rm -f ./$(DEPDIR)/full-read.Po + -rm -f ./$(DEPDIR)/full-write.Po + -rm -f ./$(DEPDIR)/gai_strerror.Po + -rm -f ./$(DEPDIR)/getaddrinfo.Po + -rm -f ./$(DEPDIR)/gethostname.Po + -rm -f ./$(DEPDIR)/getloadavg.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/idpriv-droptemp.Po + -rm -f ./$(DEPDIR)/inet_ntop.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/localcharset.Po + -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/math.Po + -rm -f ./$(DEPDIR)/mbrtowc.Po + -rm -f ./$(DEPDIR)/mbsinit.Po + -rm -f ./$(DEPDIR)/mbtowc.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/mktime.Po + -rm -f ./$(DEPDIR)/mountlist.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/nl_langinfo.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/read.Po + -rm -f ./$(DEPDIR)/regcomp.Po + -rm -f ./$(DEPDIR)/regex.Po + -rm -f ./$(DEPDIR)/regex_internal.Po + -rm -f ./$(DEPDIR)/regexec.Po + -rm -f ./$(DEPDIR)/safe-read.Po + -rm -f ./$(DEPDIR)/setenv.Po + -rm -f ./$(DEPDIR)/sha1.Po + -rm -f ./$(DEPDIR)/snprintf.Po + -rm -f ./$(DEPDIR)/sockets.Po + -rm -f ./$(DEPDIR)/strcasecmp.Po + -rm -f ./$(DEPDIR)/strcasestr.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/strncasecmp.Po + -rm -f ./$(DEPDIR)/strndup.Po + -rm -f ./$(DEPDIR)/strnlen.Po + -rm -f ./$(DEPDIR)/strsep.Po + -rm -f ./$(DEPDIR)/strstr.Po + -rm -f ./$(DEPDIR)/sys_socket.Po + -rm -f ./$(DEPDIR)/time_r.Po + -rm -f ./$(DEPDIR)/timegm.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unsetenv.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/vasprintf.Po + -rm -f ./$(DEPDIR)/vsnprintf.Po + -rm -f ./$(DEPDIR)/wcrtomb.Po + -rm -f ./$(DEPDIR)/wctype-h.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f ./$(DEPDIR)/xstrndup.Po + -rm -f glthread/$(DEPDIR)/lock.Po + -rm -f glthread/$(DEPDIR)/threadlib.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1980,7 +2163,84 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) glthread/$(DEPDIR) + -rm -f ./$(DEPDIR)/asnprintf.Po + -rm -f ./$(DEPDIR)/asprintf.Po + -rm -f ./$(DEPDIR)/base64.Po + -rm -f ./$(DEPDIR)/basename-lgpl.Po + -rm -f ./$(DEPDIR)/basename.Po + -rm -f ./$(DEPDIR)/btowc.Po + -rm -f ./$(DEPDIR)/dirname-lgpl.Po + -rm -f ./$(DEPDIR)/dirname.Po + -rm -f ./$(DEPDIR)/error.Po + -rm -f ./$(DEPDIR)/exitfail.Po + -rm -f ./$(DEPDIR)/fd-hook.Po + -rm -f ./$(DEPDIR)/float.Po + -rm -f ./$(DEPDIR)/floor.Po + -rm -f ./$(DEPDIR)/floorf.Po + -rm -f ./$(DEPDIR)/fsusage.Po + -rm -f ./$(DEPDIR)/full-read.Po + -rm -f ./$(DEPDIR)/full-write.Po + -rm -f ./$(DEPDIR)/gai_strerror.Po + -rm -f ./$(DEPDIR)/getaddrinfo.Po + -rm -f ./$(DEPDIR)/gethostname.Po + -rm -f ./$(DEPDIR)/getloadavg.Po + -rm -f ./$(DEPDIR)/getopt.Po + -rm -f ./$(DEPDIR)/getopt1.Po + -rm -f ./$(DEPDIR)/idpriv-droptemp.Po + -rm -f ./$(DEPDIR)/inet_ntop.Po + -rm -f ./$(DEPDIR)/itold.Po + -rm -f ./$(DEPDIR)/localcharset.Po + -rm -f ./$(DEPDIR)/localeconv.Po + -rm -f ./$(DEPDIR)/malloc.Po + -rm -f ./$(DEPDIR)/malloca.Po + -rm -f ./$(DEPDIR)/math.Po + -rm -f ./$(DEPDIR)/mbrtowc.Po + -rm -f ./$(DEPDIR)/mbsinit.Po + -rm -f ./$(DEPDIR)/mbtowc.Po + -rm -f ./$(DEPDIR)/memchr.Po + -rm -f ./$(DEPDIR)/mktime.Po + -rm -f ./$(DEPDIR)/mountlist.Po + -rm -f ./$(DEPDIR)/msvc-inval.Po + -rm -f ./$(DEPDIR)/msvc-nothrow.Po + -rm -f ./$(DEPDIR)/nl_langinfo.Po + -rm -f ./$(DEPDIR)/printf-args.Po + -rm -f ./$(DEPDIR)/printf-parse.Po + -rm -f ./$(DEPDIR)/read.Po + -rm -f ./$(DEPDIR)/regcomp.Po + -rm -f ./$(DEPDIR)/regex.Po + -rm -f ./$(DEPDIR)/regex_internal.Po + -rm -f ./$(DEPDIR)/regexec.Po + -rm -f ./$(DEPDIR)/safe-read.Po + -rm -f ./$(DEPDIR)/setenv.Po + -rm -f ./$(DEPDIR)/sha1.Po + -rm -f ./$(DEPDIR)/snprintf.Po + -rm -f ./$(DEPDIR)/sockets.Po + -rm -f ./$(DEPDIR)/strcasecmp.Po + -rm -f ./$(DEPDIR)/strcasestr.Po + -rm -f ./$(DEPDIR)/strerror-override.Po + -rm -f ./$(DEPDIR)/strerror.Po + -rm -f ./$(DEPDIR)/stripslash.Po + -rm -f ./$(DEPDIR)/strncasecmp.Po + -rm -f ./$(DEPDIR)/strndup.Po + -rm -f ./$(DEPDIR)/strnlen.Po + -rm -f ./$(DEPDIR)/strsep.Po + -rm -f ./$(DEPDIR)/strstr.Po + -rm -f ./$(DEPDIR)/sys_socket.Po + -rm -f ./$(DEPDIR)/time_r.Po + -rm -f ./$(DEPDIR)/timegm.Po + -rm -f ./$(DEPDIR)/unistd.Po + -rm -f ./$(DEPDIR)/unsetenv.Po + -rm -f ./$(DEPDIR)/vasnprintf.Po + -rm -f ./$(DEPDIR)/vasprintf.Po + -rm -f ./$(DEPDIR)/vsnprintf.Po + -rm -f ./$(DEPDIR)/wcrtomb.Po + -rm -f ./$(DEPDIR)/wctype-h.Po + -rm -f ./$(DEPDIR)/xalloc-die.Po + -rm -f ./$(DEPDIR)/xmalloc.Po + -rm -f ./$(DEPDIR)/xsize.Po + -rm -f ./$(DEPDIR)/xstrndup.Po + -rm -f glthread/$(DEPDIR)/lock.Po + -rm -f glthread/$(DEPDIR)/threadlib.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1999,25 +2259,26 @@ ps-am: uninstall-am: uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check install install-am \ + install-exec install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - ctags ctags-recursive distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-local install-html \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + am--depfiles check check-am clean clean-generic clean-libtool \ + clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-local install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-local + tags-am uninstall uninstall-am uninstall-local + +.PRECIOUS: Makefile # We need the following in order to create when the system diff --git a/lib/Makefile.in b/lib/Makefile.in index d4daaf7..4969c7a 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +89,6 @@ build_triplet = @build@ host_triplet = @host@ @USE_PARSE_INI_TRUE@am__append_1 = parse_ini.c extra_opts.c subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -155,11 +191,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libmonitoringplug_a_AR = $(AR) $(ARFLAGS) libmonitoringplug_a_LIBADD = am__libmonitoringplug_a_SOURCES_DIST = utils_base.c utils_disk.c \ @@ -170,28 +211,58 @@ am_libmonitoringplug_a_OBJECTS = utils_base.$(OBJEXT) \ utils_disk.$(OBJEXT) utils_tcp.$(OBJEXT) utils_cmd.$(OBJEXT) \ $(am__objects_1) libmonitoringplug_a_OBJECTS = $(am_libmonitoringplug_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/extra_opts.Po \ + ./$(DEPDIR)/parse_ini.Po ./$(DEPDIR)/utils_base.Po \ + ./$(DEPDIR)/utils_cmd.Po ./$(DEPDIR)/utils_disk.Po \ + ./$(DEPDIR)/utils_tcp.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmonitoringplug_a_SOURCES) DIST_SOURCES = $(am__libmonitoringplug_a_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -199,12 +270,35 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir distdir-am +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -236,6 +330,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1361,6 +1456,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1394,14 +1490,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1415,10 +1510,11 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libmonitoringplug.a: $(libmonitoringplug_a_OBJECTS) $(libmonitoringplug_a_DEPENDENCIES) $(EXTRA_libmonitoringplug_a_DEPENDENCIES) - -rm -f libmonitoringplug.a - $(libmonitoringplug_a_AR) libmonitoringplug.a $(libmonitoringplug_a_OBJECTS) $(libmonitoringplug_a_LIBADD) - $(RANLIB) libmonitoringplug.a + $(AM_V_at)-rm -f libmonitoringplug.a + $(AM_V_AR)$(libmonitoringplug_a_AR) libmonitoringplug.a $(libmonitoringplug_a_OBJECTS) $(libmonitoringplug_a_LIBADD) + $(AM_V_at)$(RANLIB) libmonitoringplug.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1426,33 +1522,39 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra_opts.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_ini.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_base.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_cmd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_disk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_tcp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extra_opts.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse_ini.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_base.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_cmd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_disk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils_tcp.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1461,22 +1563,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1491,57 +1596,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1557,12 +1617,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1574,15 +1629,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1591,11 +1642,29 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1691,7 +1760,12 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/extra_opts.Po + -rm -f ./$(DEPDIR)/parse_ini.Po + -rm -f ./$(DEPDIR)/utils_base.Po + -rm -f ./$(DEPDIR)/utils_cmd.Po + -rm -f ./$(DEPDIR)/utils_disk.Po + -rm -f ./$(DEPDIR)/utils_tcp.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1737,7 +1811,12 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/extra_opts.Po + -rm -f ./$(DEPDIR)/parse_ini.Po + -rm -f ./$(DEPDIR)/utils_base.Po + -rm -f ./$(DEPDIR)/utils_cmd.Po + -rm -f ./$(DEPDIR)/utils_disk.Po + -rm -f ./$(DEPDIR)/utils_tcp.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1756,12 +1835,11 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--depfiles check check-am clean clean-generic clean-libtool \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -1771,8 +1849,10 @@ uninstall-am: install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile test test-debug: diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index 1864d3e..bc90142 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,7 +92,6 @@ EXTRA_PROGRAMS = test_utils$(EXEEXT) test_disk$(EXEEXT) \ test_ini1$(EXEEXT) test_ini3$(EXEEXT) test_opts1$(EXEEXT) \ test_opts2$(EXEEXT) test_opts3$(EXEEXT) subdir = lib/tests -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -158,6 +194,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -168,6 +205,10 @@ test_base64_OBJECTS = test_base64.$(OBJEXT) test_base64_LDADD = $(LDADD) test_base64_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = test_cmd_SOURCES = test_cmd.c test_cmd_OBJECTS = test_cmd.$(OBJEXT) test_cmd_LDADD = $(LDADD) @@ -213,19 +254,46 @@ test_utils_OBJECTS = test_utils.$(OBJEXT) test_utils_LDADD = $(LDADD) test_utils_DEPENDENCIES = $(top_srcdir)/lib/libmonitoringplug.a \ $(top_srcdir)/gl/libgnu.a +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/test_base64.Po \ + ./$(DEPDIR)/test_cmd.Po ./$(DEPDIR)/test_disk.Po \ + ./$(DEPDIR)/test_ini1.Po ./$(DEPDIR)/test_ini3.Po \ + ./$(DEPDIR)/test_opts1.Po ./$(DEPDIR)/test_opts2.Po \ + ./$(DEPDIR)/test_opts3.Po ./$(DEPDIR)/test_tcp.Po \ + ./$(DEPDIR)/test_utils.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = DIST_SOURCES = test_base64.c test_cmd.c test_disk.c test_ini1.c \ test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_tcp.c \ test_utils.c @@ -234,16 +302,239 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs \ + $(top_srcdir)/build-aux/test-driver README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1369,6 +1660,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1400,7 +1692,7 @@ SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1 all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1413,14 +1705,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1449,36 +1740,46 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + test_base64$(EXEEXT): $(test_base64_OBJECTS) $(test_base64_DEPENDENCIES) $(EXTRA_test_base64_DEPENDENCIES) @rm -f test_base64$(EXEEXT) - $(LINK) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_base64_OBJECTS) $(test_base64_LDADD) $(LIBS) + test_cmd$(EXEEXT): $(test_cmd_OBJECTS) $(test_cmd_DEPENDENCIES) $(EXTRA_test_cmd_DEPENDENCIES) @rm -f test_cmd$(EXEEXT) - $(LINK) $(test_cmd_OBJECTS) $(test_cmd_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_cmd_OBJECTS) $(test_cmd_LDADD) $(LIBS) + test_disk$(EXEEXT): $(test_disk_OBJECTS) $(test_disk_DEPENDENCIES) $(EXTRA_test_disk_DEPENDENCIES) @rm -f test_disk$(EXEEXT) - $(LINK) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_disk_OBJECTS) $(test_disk_LDADD) $(LIBS) + test_ini1$(EXEEXT): $(test_ini1_OBJECTS) $(test_ini1_DEPENDENCIES) $(EXTRA_test_ini1_DEPENDENCIES) @rm -f test_ini1$(EXEEXT) - $(LINK) $(test_ini1_OBJECTS) $(test_ini1_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_ini1_OBJECTS) $(test_ini1_LDADD) $(LIBS) + test_ini3$(EXEEXT): $(test_ini3_OBJECTS) $(test_ini3_DEPENDENCIES) $(EXTRA_test_ini3_DEPENDENCIES) @rm -f test_ini3$(EXEEXT) - $(LINK) $(test_ini3_OBJECTS) $(test_ini3_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_ini3_OBJECTS) $(test_ini3_LDADD) $(LIBS) + test_opts1$(EXEEXT): $(test_opts1_OBJECTS) $(test_opts1_DEPENDENCIES) $(EXTRA_test_opts1_DEPENDENCIES) @rm -f test_opts1$(EXEEXT) - $(LINK) $(test_opts1_OBJECTS) $(test_opts1_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_opts1_OBJECTS) $(test_opts1_LDADD) $(LIBS) + test_opts2$(EXEEXT): $(test_opts2_OBJECTS) $(test_opts2_DEPENDENCIES) $(EXTRA_test_opts2_DEPENDENCIES) @rm -f test_opts2$(EXEEXT) - $(LINK) $(test_opts2_OBJECTS) $(test_opts2_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_opts2_OBJECTS) $(test_opts2_LDADD) $(LIBS) + test_opts3$(EXEEXT): $(test_opts3_OBJECTS) $(test_opts3_DEPENDENCIES) $(EXTRA_test_opts3_DEPENDENCIES) @rm -f test_opts3$(EXEEXT) - $(LINK) $(test_opts3_OBJECTS) $(test_opts3_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_opts3_OBJECTS) $(test_opts3_LDADD) $(LIBS) + test_tcp$(EXEEXT): $(test_tcp_OBJECTS) $(test_tcp_DEPENDENCIES) $(EXTRA_test_tcp_DEPENDENCIES) @rm -f test_tcp$(EXEEXT) - $(LINK) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_tcp_OBJECTS) $(test_tcp_LDADD) $(LIBS) + test_utils$(EXEEXT): $(test_utils_OBJECTS) $(test_utils_DEPENDENCIES) $(EXTRA_test_utils_DEPENDENCIES) @rm -f test_utils$(EXEEXT) - $(LINK) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1486,37 +1787,43 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base64.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_disk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts1.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts3.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tcp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_base64.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_cmd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_disk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ini3.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts1.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts2.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_opts3.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_tcp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_utils.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1524,26 +1831,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1555,15 +1851,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1572,104 +1864,185 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< -distdir: $(DISTFILES) +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: $(check_PROGRAMS) + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1725,6 +2098,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -1741,7 +2117,16 @@ clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_base64.Po + -rm -f ./$(DEPDIR)/test_cmd.Po + -rm -f ./$(DEPDIR)/test_disk.Po + -rm -f ./$(DEPDIR)/test_ini1.Po + -rm -f ./$(DEPDIR)/test_ini3.Po + -rm -f ./$(DEPDIR)/test_opts1.Po + -rm -f ./$(DEPDIR)/test_opts2.Po + -rm -f ./$(DEPDIR)/test_opts3.Po + -rm -f ./$(DEPDIR)/test_tcp.Po + -rm -f ./$(DEPDIR)/test_utils.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1787,7 +2172,16 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/test_base64.Po + -rm -f ./$(DEPDIR)/test_cmd.Po + -rm -f ./$(DEPDIR)/test_disk.Po + -rm -f ./$(DEPDIR)/test_ini1.Po + -rm -f ./$(DEPDIR)/test_ini3.Po + -rm -f ./$(DEPDIR)/test_opts1.Po + -rm -f ./$(DEPDIR)/test_opts2.Po + -rm -f ./$(DEPDIR)/test_opts3.Po + -rm -f ./$(DEPDIR)/test_tcp.Po + -rm -f ./$(DEPDIR)/test_utils.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1808,19 +2202,22 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-checkPROGRAMS clean-generic clean-libtool \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am recheck tags tags-am uninstall \ + uninstall-am + +.PRECIOUS: Makefile test: ${noinst_PROGRAMS} diff --git a/lib/utils_base.c b/lib/utils_base.c index fd7058d..08fa215 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -128,6 +128,7 @@ range temp_range->end = 0; temp_range->end_infinity = TRUE; temp_range->alert_on = OUTSIDE; + temp_range->text = strdup(str); if (str[0] == '@') { temp_range->alert_on = INSIDE; @@ -706,4 +707,3 @@ void np_state_write_string(time_t data_time, char *data_string) { np_free(temp_file); } - diff --git a/lib/utils_base.h b/lib/utils_base.h index d7e7dff..9482f23 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -23,6 +23,7 @@ typedef struct range_struct { double end; int end_infinity; int alert_on; /* OUTSIDE (default) or INSIDE */ + char* text; /* original unparsed text input */ } range; typedef struct thresholds_struct { diff --git a/lib/utils_disk.h b/lib/utils_disk.h index 999270c..bf52e4c 100644 --- a/lib/utils_disk.h +++ b/lib/utils_disk.h @@ -27,7 +27,7 @@ struct parameter_list uintmax_t total, available, available_to_root, used, inodes_free, inodes_free_to_root, inodes_used, inodes_total; double dfree_pct, dused_pct; - double dused_units, dfree_units, dtotal_units; + uint64_t dused_units, dfree_units, dtotal_units; double dused_inodes_percent, dfree_inodes_percent; }; diff --git a/pkg/solaris/pkginfo b/pkg/solaris/pkginfo index edb44db..c6f6ccb 100644 --- a/pkg/solaris/pkginfo +++ b/pkg/solaris/pkginfo @@ -2,11 +2,11 @@ PKG="NGOSplugin" NAME="monitoring-plugins" DESC="Network Monitoring Plugins for Nagios and compatible" ARCH="unknown" -VERSION="2.3.1,REV=2021.04.10.16.16" +VERSION="2.3.2,REV=2022.10.19.14.57" CATEGORY="application" VENDOR="Monitoring Plugins Development Team" EMAIL="devel@monitoring-plugins.org" -PSTAMP="nag20210410161613" +PSTAMP="nag20221019145705" BASEDIR="/" CLASSES="none" diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg index a21176e..73b3c64 100755 --- a/pkg/solaris/solpkg +++ b/pkg/solaris/solpkg @@ -9,7 +9,7 @@ $pkgtrans = "/usr/bin/pkgtrans"; $prototype = "prototype"; $pkginfo = "pkginfo"; $preinstall = "preinstall"; -$egrep = "/usr/bin/egrep"; +$egrep = "/usr/bin/grep -E"; # Sanity check diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index a1ebb6d..7cd2675 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -37,6 +37,9 @@ TESTS = @PLUGIN_TEST@ test: perl -I $(top_builddir) -I $(top_srcdir) ../test.pl +test-debug: + NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl + setuid_root_mode = ug=rx,u+s # /* Author Coreutils team - see ACKNOWLEDGEMENTS */ diff --git a/plugins-root/Makefile.in b/plugins-root/Makefile.in index ae1fe2d..7af912e 100644 --- a/plugins-root/Makefile.in +++ b/plugins-root/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +90,6 @@ noinst_PROGRAMS = check_dhcp$(EXEEXT) check_icmp$(EXEEXT) \ @EXTRAS_ROOT@ $(am__empty) EXTRA_PROGRAMS = pst3$(EXEEXT) subdir = plugins-root -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -156,6 +192,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -167,27 +204,54 @@ am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = ../plugins/netutils.o $(BASEOBJS) \ $(am__DEPENDENCIES_1) am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = check_icmp_SOURCES = check_icmp.c check_icmp_OBJECTS = check_icmp.$(OBJEXT) pst3_SOURCES = pst3.c pst3_OBJECTS = pst3-pst3.$(OBJEXT) pst3_LDADD = $(LDADD) -pst3_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(pst3_CFLAGS) $(CFLAGS) $(pst3_LDFLAGS) \ - $(LDFLAGS) -o $@ +pst3_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(pst3_CFLAGS) $(CFLAGS) \ + $(pst3_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/check_dhcp.Po \ + ./$(DEPDIR)/check_icmp.Po ./$(DEPDIR)/pst3-pst3.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = check_dhcp.c check_icmp.c pst3.c DIST_SOURCES = check_dhcp.c check_icmp.c pst3.c am__can_run_installinfo = \ @@ -195,10 +259,232 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t $(srcdir) pkglibexecdir = @pkglibexecdir@ @@ -206,6 +492,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1331,6 +1618,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1381,7 +1669,7 @@ check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS) all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1394,14 +1682,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins-root/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins-root/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1421,15 +1708,18 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + check_dhcp$(EXEEXT): $(check_dhcp_OBJECTS) $(check_dhcp_DEPENDENCIES) $(EXTRA_check_dhcp_DEPENDENCIES) @rm -f check_dhcp$(EXEEXT) - $(LINK) $(check_dhcp_OBJECTS) $(check_dhcp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_dhcp_OBJECTS) $(check_dhcp_LDADD) $(LIBS) + check_icmp$(EXEEXT): $(check_icmp_OBJECTS) $(check_icmp_DEPENDENCIES) $(EXTRA_check_icmp_DEPENDENCIES) @rm -f check_icmp$(EXEEXT) - $(LINK) $(check_icmp_OBJECTS) $(check_icmp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_icmp_OBJECTS) $(check_icmp_LDADD) $(LIBS) + pst3$(EXEEXT): $(pst3_OBJECTS) $(pst3_DEPENDENCIES) $(EXTRA_pst3_DEPENDENCIES) @rm -f pst3$(EXEEXT) - $(pst3_LINK) $(pst3_OBJECTS) $(pst3_LDADD) $(LIBS) + $(AM_V_CCLD)$(pst3_LINK) $(pst3_OBJECTS) $(pst3_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1437,44 +1727,50 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dhcp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_icmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pst3-pst3.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dhcp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_icmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pst3-pst3.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< pst3-pst3.o: pst3.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.o -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pst3.c' object='pst3-pst3.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.o -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pst3.c' object='pst3-pst3.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.o `test -f 'pst3.c' || echo '$(srcdir)/'`pst3.c pst3-pst3.obj: pst3.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.obj -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='pst3.c' object='pst3-pst3.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -MT pst3-pst3.obj -MD -MP -MF $(DEPDIR)/pst3-pst3.Tpo -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/pst3-pst3.Tpo $(DEPDIR)/pst3-pst3.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='pst3.c' object='pst3-pst3.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(pst3_CPPFLAGS) $(CPPFLAGS) $(pst3_CFLAGS) $(CFLAGS) -c -o pst3-pst3.obj `if test -f 'pst3.c'; then $(CYGPATH_W) 'pst3.c'; else $(CYGPATH_W) '$(srcdir)/pst3.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1482,26 +1778,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1513,15 +1798,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1530,104 +1811,185 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< -distdir: $(DISTFILES) +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1682,6 +2044,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -1698,7 +2063,9 @@ clean-am: clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/check_dhcp.Po + -rm -f ./$(DEPDIR)/check_icmp.Po + -rm -f ./$(DEPDIR)/pst3-pst3.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1744,7 +2111,9 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/check_dhcp.Po + -rm -f ./$(DEPDIR)/check_icmp.Po + -rm -f ./$(DEPDIR)/pst3-pst3.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1765,19 +2134,22 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-generic clean-libtool clean-local clean-noinstPROGRAMS \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-local install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ + check-am clean clean-generic clean-libtool clean-local \ + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-local \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am + +.PRECIOUS: Makefile @RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @RELEASE_PRESENT_FALSE@ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN @@ -1787,6 +2159,9 @@ uninstall-am: test: perl -I $(top_builddir) -I $(top_srcdir) ../test.pl +test-debug: + NPTEST_DEBUG=1 HARNESS_VERBOSE=1 perl -I $(top_builddir) -I $(top_srcdir) ../test.pl + install-root: $(noinst_PROGRAMS) @$(INSTALL_SUID) diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index 31eb4c6..f8f1535 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c @@ -50,19 +50,11 @@ const char *email = "devel@monitoring-plugins.org"; #if HAVE_SYS_SOCKIO_H #include #endif -#include + #include -#include -#include -#include -#include -#include -#include #include -#include +#include #include -#include -#include #include #include #include @@ -71,8 +63,6 @@ const char *email = "devel@monitoring-plugins.org"; #include #include #include -#include -#include /** sometimes undefined system macros (quite a few, actually) **/ @@ -207,7 +197,7 @@ static int add_target(char *); static int add_target_ip(char *, struct sockaddr_storage *); static int handle_random_icmp(unsigned char *, struct sockaddr_storage *); static void parse_address(struct sockaddr_storage *, char *, int); -static unsigned short icmp_checksum(unsigned short *, int); +static unsigned short icmp_checksum(uint16_t *, size_t); static void finish(int); static void crash(const char *, ...); @@ -223,7 +213,7 @@ static int mode, protocols, sockets, debug = 0, timeout = 10; static unsigned short icmp_data_size = DEFAULT_PING_DATA_SIZE; static unsigned short icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN; -static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0; +static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0, ttl = 0; #define icmp_pkts_en_route (icmp_sent - (icmp_recv + icmp_lost)) static unsigned short targets_down = 0, targets = 0, packets = 0; #define targets_alive (targets - targets_down) @@ -233,7 +223,6 @@ static pid_t pid; static struct timezone tz; static struct timeval prog_start; static unsigned long long max_completion_time = 0; -static unsigned char ttl = 0; /* outgoing ttl */ static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values */ static int min_hosts_alive = -1; float pkt_backoff_factor = 1.5; @@ -410,6 +399,7 @@ main(int argc, char **argv) #ifdef SO_TIMESTAMP int on = 1; #endif + char *source_ip = NULL; char * opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:64"; setlocale (LC_ALL, ""); @@ -464,7 +454,6 @@ main(int argc, char **argv) /* Parse protocol arguments first */ for(i = 1; i < argc; i++) { while((arg = getopt(argc, argv, opts_str)) != EOF) { - unsigned short size; switch(arg) { case '4': if (address_family != -1) @@ -487,10 +476,10 @@ main(int argc, char **argv) /* Reset argument scanning */ optind = 1; + unsigned short size; /* parse the arguments */ for(i = 1; i < argc; i++) { while((arg = getopt(argc, argv, opts_str)) != EOF) { - unsigned short size; switch(arg) { case 'v': debug++; @@ -502,7 +491,7 @@ main(int argc, char **argv) icmp_data_size = size; icmp_pkt_size = size + ICMP_MINLEN; } else - usage_va("ICMP data length must be between: %d and %d", + usage_va("ICMP data length must be between: %lu and %lu", sizeof(struct icmp) + sizeof(struct icmp_ping_data), MAX_PING_DATA - 1); break; @@ -530,7 +519,7 @@ main(int argc, char **argv) add_target(optarg); break; case 'l': - ttl = (unsigned char)strtoul(optarg, NULL, 0); + ttl = (int)strtoul(optarg, NULL, 0); break; case 'm': min_hosts_alive = (int)strtoul(optarg, NULL, 0); @@ -542,7 +531,7 @@ main(int argc, char **argv) } break; case 's': /* specify source IP address */ - set_source_ip(optarg); + source_ip = optarg; break; case 'V': /* version */ print_revision (progname, NP_VERSION); @@ -597,6 +586,8 @@ main(int argc, char **argv) sockets |= HAVE_ICMP; else icmp_sockerrno = errno; + if( source_ip ) + set_source_ip(source_ip); #ifdef SO_TIMESTAMP if(setsockopt(icmp_sock, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on))) @@ -717,7 +708,7 @@ main(int argc, char **argv) static void run_checks() { - u_int i, t, result; + u_int i, t; u_int final_wait, time_passed; /* this loop might actually violate the pkt_interval or target_interval @@ -735,9 +726,9 @@ run_checks() /* we're still in the game, so send next packet */ (void)send_icmp_ping(icmp_sock, table[t]); - result = wait_for_reply(icmp_sock, target_interval); + wait_for_reply(icmp_sock, target_interval); } - result = wait_for_reply(icmp_sock, pkt_interval * targets); + wait_for_reply(icmp_sock, pkt_interval * targets); } if(icmp_pkts_en_route && targets_alive) { @@ -757,7 +748,7 @@ run_checks() * haven't yet */ if(debug) printf("Waiting for %u micro-seconds (%0.3f msecs)\n", final_wait, (float)final_wait / 1000); - result = wait_for_reply(icmp_sock, final_wait); + wait_for_reply(icmp_sock, final_wait); } } @@ -776,7 +767,7 @@ static int wait_for_reply(int sock, u_int t) { int n, hlen; - static unsigned char buf[4096]; + static unsigned char buf[65536]; struct sockaddr_storage resp_addr; union ip_hdr *ip; union icmp_packet packet; @@ -913,15 +904,33 @@ wait_for_reply(int sock, u_int t) if(debug) { char address[INET6_ADDRSTRLEN]; parse_address(&resp_addr, address, sizeof(address)); - printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n", - (float)tdiff / 1000, address, - ttl, ip->ip.ip_ttl, (float)host->rtmax / 1000, (float)host->rtmin / 1000); + + switch(address_family) { + case AF_INET: { + printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n", + (float)tdiff / 1000, + address, + ttl, + ip->ip.ip_ttl, + (float)host->rtmax / 1000, + (float)host->rtmin / 1000); + break; + }; + case AF_INET6: { + printf("%0.3f ms rtt from %s, outgoing ttl: %u, max: %0.3f, min: %0.3f\n", + (float)tdiff / 1000, + address, + ttl, + (float)host->rtmax / 1000, + (float)host->rtmin / 1000); + }; + } } /* if we're in hostcheck mode, exit with limited printouts */ if(mode == MODE_HOSTCHECK) { printf("OK - %s responds to ICMP. Packet %u, rta %0.3fms|" - "pkt=%u;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n", + "pkt=%u;;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n", host->name, icmp_recv, (float)tdiff / 1000, icmp_recv, packets, (float)tdiff / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000); @@ -938,6 +947,7 @@ static int send_icmp_ping(int sock, struct rta_host *host) { long int len; + size_t addrlen; struct icmp_ping_data data; struct msghdr hdr; struct iovec iov; @@ -969,6 +979,7 @@ send_icmp_ping(int sock, struct rta_host *host) if (address_family == AF_INET) { struct icmp *icp = (struct icmp*)buf; + addrlen = sizeof(struct sockaddr_in); memcpy(&icp->icmp_data, &data, sizeof(data)); @@ -977,7 +988,7 @@ send_icmp_ping(int sock, struct rta_host *host) icp->icmp_cksum = 0; icp->icmp_id = htons(pid); icp->icmp_seq = htons(host->id++); - icp->icmp_cksum = icmp_checksum((unsigned short*)buf, icmp_pkt_size); + icp->icmp_cksum = icmp_checksum((uint16_t*)buf, (size_t)icmp_pkt_size); if (debug > 2) printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to host %s\n", @@ -985,7 +996,10 @@ send_icmp_ping(int sock, struct rta_host *host) } else { struct icmp6_hdr *icp6 = (struct icmp6_hdr*)buf; + addrlen = sizeof(struct sockaddr_in6); + memcpy(&icp6->icmp6_dataun.icmp6_un_data8[4], &data, sizeof(data)); + icp6->icmp6_type = ICMP6_ECHO_REQUEST; icp6->icmp6_code = 0; icp6->icmp6_cksum = 0; @@ -1006,7 +1020,7 @@ send_icmp_ping(int sock, struct rta_host *host) memset(&hdr, 0, sizeof(hdr)); hdr.msg_name = (struct sockaddr *)&host->saddr_in; - hdr.msg_namelen = sizeof(struct sockaddr_storage); + hdr.msg_namelen = addrlen; hdr.msg_iov = &iov; hdr.msg_iovlen = 1; @@ -1293,7 +1307,7 @@ add_target_ip(char *arg, struct sockaddr_storage *in) if(!host) { char straddr[INET6_ADDRSTRLEN]; parse_address((struct sockaddr_storage*)&in, straddr, sizeof(straddr)); - crash("add_target_ip(%s, %s): malloc(%d) failed", + crash("add_target_ip(%s, %s): malloc(%lu) failed", arg, straddr, sizeof(struct rta_host)); } memset(host, 0, sizeof(struct rta_host)); @@ -1514,18 +1528,19 @@ get_threshold(char *str, threshold *th) } unsigned short -icmp_checksum(unsigned short *p, int n) +icmp_checksum(uint16_t *p, size_t n) { unsigned short cksum; long sum = 0; - while(n > 2) { - sum += *p++; - n -= sizeof(unsigned short); + /* sizeof(uint16_t) == 2 */ + while(n >= 2) { + sum += *(p++); + n -= 2; } /* mop up the occasional odd byte */ - if(n == 1) sum += (unsigned char)*p; + if(n == 1) sum += *((uint8_t *)p -1); sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */ sum += (sum >> 16); /* add carry */ diff --git a/plugins-root/t/check_dhcp.t b/plugins-root/t/check_dhcp.t index 222f454..ce62773 100644 --- a/plugins-root/t/check_dhcp.t +++ b/plugins-root/t/check_dhcp.t @@ -19,7 +19,7 @@ if ($allow_sudo eq "yes" or $> == 0) { my $sudo = $> == 0 ? '' : 'sudo'; my $successOutput = '/OK: Received \d+ DHCPOFFER\(s\), \d+ of 1 requested servers responded, max lease time = \d+ sec\./'; -my $failureOutput = '/CRITICAL: No DHCPOFFERs were received/'; +my $failureOutput = '/CRITICAL: (No DHCPOFFERs were received|Received \d+ DHCPOFFER\(s\), 0 of 1 requested servers responded, max lease time = \d+ sec\.)/'; my $invalidOutput = '/Invalid hostname/'; my $host_responsive = getTestParameter( "NP_HOST_DHCP_RESPONSIVE", @@ -36,7 +36,12 @@ my $hostname_invalid = getTestParameter( "NP_HOSTNAME_INVALID", # try to determince interface my $interface = ''; -if(`ifconfig -a 2>/dev/null` =~ m/^(e\w*\d+)/mx and $1 ne 'eth0') { + +# find interface used for default route +if (-x '/usr/sbin/ip' and `/usr/sbin/ip route get 1.1.1.1 2>/dev/null` =~ m/\sdev\s(\S+)/) { + $interface = "-i $1"; +} +elsif (`ifconfig -a 2>/dev/null` =~ m/^(e\w*\d+)/mx and $1 ne 'eth0') { $interface = ' -i '.$1; } diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t index e043d4e..f6aa681 100644 --- a/plugins-root/t/check_icmp.t +++ b/plugins-root/t/check_icmp.t @@ -12,7 +12,7 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO", "no" ); if ($allow_sudo eq "yes" or $> == 0) { - plan tests => 16; + plan tests => 20; } else { plan skip_all => "Need sudo to test check_icmp"; } @@ -83,3 +83,14 @@ $res = NPTest->testCmd( is( $res->return_code, 2, "One of two host nonresponsive - two required" ); like( $res->output, $failureOutput, "Output OK" ); +$res = NPTest->testCmd( + "$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 10000ms,100% -c 10000ms,100% -n 1 -m 2" + ); +is( $res->return_code, 0, "IPv4 source_ip accepted" ); +like( $res->output, $successOutput, "Output OK" ); + +$res = NPTest->testCmd( + "$sudo ./check_icmp -H $host_responsive -b 65507" + ); +is( $res->return_code, 0, "Try max paket size" ); +like( $res->output, $successOutput, "Output OK - Didn't overflow" ); diff --git a/plugins-scripts/Makefile.in b/plugins-scripts/Makefile.in index 28f20ec..6dabd8a 100644 --- a/plugins-scripts/Makefile.in +++ b/plugins-scripts/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,23 +14,61 @@ @SET_MAKE@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -50,8 +87,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = plugins-scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/utils.pm.in $(srcdir)/utils.sh.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -154,6 +189,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = utils.pm utils.sh @@ -187,6 +223,18 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libexecdir)" SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -194,8 +242,186 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/utils.pm.in \ + $(srcdir)/utils.sh.in $(top_srcdir)/build-aux/mkinstalldirs \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) VPATH = $(top_srcdir) $(top_srcdir)/plugins-scripts $(top_srcdir)/plugins-scripts/t pkglibexecdir = @pkglibexecdir@ @@ -203,6 +429,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1328,6 +1555,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1363,7 +1591,7 @@ CLEANFILES = $(libexec_SCRIPTS) all: all-am .SUFFIXES: -.SUFFIXES: .pl .sh +.SUFFIXES: .pl .sh .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1376,14 +1604,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins-scripts/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins-scripts/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1439,107 +1666,173 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: + +cscope cscopelist: -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + color_start= color_end=; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 -distdir: $(DISTFILES) +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1597,6 +1890,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -1677,17 +1973,19 @@ uninstall-am: uninstall-libexecSCRIPTS .MAKE: check-am install-am install-strip .PHONY: all all-am check check-TESTS check-am clean clean-generic \ - clean-libtool clean-local distclean distclean-generic \ - distclean-libtool distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecSCRIPTS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + clean-libtool clean-local cscopelist-am ctags-am distclean \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecSCRIPTS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-libexecSCRIPTS + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags-am \ + uninstall uninstall-am uninstall-libexecSCRIPTS + +.PRECIOUS: Makefile @RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @RELEASE_PRESENT_FALSE@ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl old mode 100755 new mode 100644 index 28c49e8..15d1634 --- a/plugins-scripts/check_disk_smb.pl +++ b/plugins-scripts/check_disk_smb.pl @@ -22,7 +22,7 @@ require 5.004; use POSIX qw(setsid); use strict; use Getopt::Long; -use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose); +use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $opt_C $opt_t $verbose); use vars qw($PROGNAME); use FindBin; use lib "$FindBin::Bin"; @@ -43,6 +43,7 @@ $ENV{'ENV'}=''; Getopt::Long::Configure('bundling'); GetOptions ("v" => \$verbose, "verbose" => \$verbose, + "t=i" => \$opt_t, "timeout=i" => \$opt_t, "P=s" => \$opt_P, "port=s" => \$opt_P, "V" => \$opt_V, "version" => \$opt_V, "h" => \$opt_h, "help" => \$opt_h, @@ -53,7 +54,8 @@ GetOptions "s=s" => \$opt_s, "share=s" => \$opt_s, "W=s" => \$opt_W, "workgroup=s" => \$opt_W, "H=s" => \$opt_H, "hostname=s" => \$opt_H, - "a=s" => \$opt_a, "address=s" => \$opt_a); + "a=s" => \$opt_a, "address=s" => \$opt_a, + "C=s" => \$opt_C, "configfile=s" => \$opt_C); if ($opt_V) { print_revision($PROGNAME,'@NP_VERSION@'); #' @@ -91,6 +93,12 @@ my $warn = $1 if ($opt_w =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); my $crit = $1 if ($opt_c =~ /^([0-9]{1,2}\%?|100\%?|[0-9]+[kMG])$/); ($crit) || usage("Invalid critical threshold: $opt_c\n"); +($opt_C) || ($opt_C = shift @ARGV) || ($opt_C = ""); +my $configfile = $opt_C if ($opt_C); +usage("Unable to read config file $configfile\n") if ($configfile) && (! -r $configfile); + +if ($opt_t && $opt_t =~ /^([0-9]+)$/) { $TIMEOUT = $1; } + # Execute the given command line and return anything it writes to STDOUT and/or # STDERR. (This might be useful for other plugins, too, so it should possibly # be moved to utils.pm.) @@ -193,6 +201,7 @@ my @cmd = ( defined($workgroup) ? ("-W", $workgroup) : (), defined($address) ? ("-I", $address) : (), defined($opt_P) ? ("-p", $opt_P) : (), + defined($configfile) ? ("-s", $configfile) : (), "-c", "du" ); @@ -292,7 +301,8 @@ exit $ERRORS{$state}; sub print_usage () { print "Usage: $PROGNAME -H -s -u -p - -w -c [-W ] [-P ] [-a ]\n"; + -w -c [-W ] [-P ] [-a ] [-t timeout] + [-C ]\n"; } sub print_help () { @@ -318,11 +328,14 @@ Perl Check SMB Disk plugin for monitoring Password to log in to server. (Defaults to an empty password) -w, --warning=INTEGER or INTEGER[kMG] Percent of used space at which a warning will be generated (Default: 85%) - -c, --critical=INTEGER or INTEGER[kMG] Percent of used space at which a critical will be generated (Defaults: 95%) +-t, --timeout=INTEGER + Seconds before connection times out (Default: 15) -P, --port=INTEGER Port to be used to connect to. Some Windows boxes use 139, others 445 (Defaults to smbclient default) +-C, --configfile=STRING + Path to configfile which should be used by smbclient (Defaults to smb.conf of your smb installation) If thresholds are followed by either a k, M, or G then check to see if that much disk space is available (kilobytes, Megabytes, Gigabytes) diff --git a/plugins-scripts/check_file_age.pl b/plugins-scripts/check_file_age.pl index 01b854a..26281dd 100755 --- a/plugins-scripts/check_file_age.pl +++ b/plugins-scripts/check_file_age.pl @@ -147,7 +147,7 @@ sub print_help () { print "\n"; print " -i | --ignore-missing : return OK if the file does not exist\n"; print " File must be no more than this many seconds old (default: warn 240 secs, crit 600)\n"; - print " File must be at least this many bytes long (default: crit 0 bytes)\n\n"; + print " File must be at least this many bytes long (default: file size is ignored (0 bytes))\n\n"; print " Both and can specify a range using the standard plugin syntax\n"; print " If any of the warning and critical arguments are in range syntax (not just bare numbers)\n"; print " then all warning and critical arguments will be interpreted as ranges.\n"; diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl index 9ede163..c190ce9 100755 --- a/plugins-scripts/check_ifoperstatus.pl +++ b/plugins-scripts/check_ifoperstatus.pl @@ -124,10 +124,10 @@ if (!defined($session)) { ## map ifdescr to ifindex - should look at being able to cache this value if (defined $ifdescr || defined $iftype) { - # escape "/" in ifdescr - very common in the Cisco world if (defined $iftype) { $status=fetch_ifindex($snmpIfType, $iftype); } else { + # escape "/" in ifdescr - very common in the Cisco world $ifdescr =~ s/\//\\\//g; $status=fetch_ifindex($snmpIfDescr, $ifdescr); # if using on device with large number of interfaces # recommend use of SNMP v2 (get-bulk) diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl index 22d21c2..d869ae7 100755 --- a/plugins-scripts/check_ircd.pl +++ b/plugins-scripts/check_ircd.pl @@ -69,7 +69,9 @@ $ENV{'ENV'}=''; # -----------------------------------------------------------------[ Global ]-- $PROGNAME = "check_ircd"; -my $NICK="ircd$$"; +# nickname shouldn't be longer than 9 chars, this might happen with large PIDs +# To prevent this, we cut of the part over 10000 +my $NICK="ircd" . $$ % 10000; my $USER_INFO="monitor localhost localhost : "; # -------------------------------------------------------------[ connection ]-- diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index d28c8d0..fdb5741 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh @@ -1,8 +1,7 @@ #!/bin/sh # # Log file pattern detector plugin for monitoring -# Written by Ethan Galstad (nagios@nagios.org) -# Last Modified: 07-31-1999 +# Written originally by Ethan Galstad (nagios@nagios.org) # # Usage: ./check_log # @@ -44,6 +43,10 @@ # check the same for pattern matches. This is necessary # because of the way the script operates. # +# 4. This plugin does NOT have an understanding of logrotation or similar +# mechanisms. Therefore bad timing could lead to missing events +# +# # Examples: # # Check for login failures in the syslog... @@ -60,20 +63,25 @@ PATH="@TRUSTED_PATH@" export PATH -PROGNAME=`basename $0` -PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` +PROGNAME=$(basename "$0") +PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,') REVISION="@NP_VERSION@" -. $PROGPATH/utils.sh +. "$PROGPATH"/utils.sh print_usage() { echo "Usage: $PROGNAME -F logfile -O oldlog -q query" echo "Usage: $PROGNAME --help" echo "Usage: $PROGNAME --version" + echo "" + echo "Other parameters:" + echo " -a|--all : Print all matching lines" + echo " -p|--perl-regex : Use perl style regular expressions in the query" + echo " -e|--extended-regex : Use extended style regular expressions in the query (not necessary for GNU grep)" } print_help() { - print_revision $PROGNAME $REVISION + print_revision "$PROGNAME" "$REVISION" echo "" print_usage echo "" @@ -87,7 +95,7 @@ print_help() { if [ $# -lt 1 ]; then print_usage - exit $STATE_UNKNOWN + exit "$STATE_UNKNOWN" fi # Grab the command line arguments @@ -100,79 +108,123 @@ while test -n "$1"; do case "$1" in --help) print_help - exit $STATE_OK + exit "$STATE_OK" ;; -h) print_help - exit $STATE_OK + exit "$STATE_OK" ;; --version) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; -V) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; --filename) logfile=$2 - shift + shift 2 ;; -F) logfile=$2 - shift + shift 2 ;; --oldlog) oldlog=$2 - shift + shift 2 ;; -O) oldlog=$2 - shift + shift 2 ;; --query) query=$2 - shift + shift 2 ;; -q) query=$2 - shift + shift 2 ;; -x) exitstatus=$2 - shift + shift 2 ;; --exitstatus) exitstatus=$2 + shift 2 + ;; + --extended-regex) + ERE=1 + shift + ;; + -e) + ERE=1 + shift + ;; + --perl-regex) + PRE=1 + shift + ;; + -p) + PRE=1 + shift + ;; + --all) + ALL=1 + shift + ;; + -a) + ALL=1 shift ;; *) echo "Unknown argument: $1" print_usage - exit $STATE_UNKNOWN + exit "$STATE_UNKNOWN" ;; esac - shift done +# Parameter sanity check +if [ $ERE ] && [ $PRE ] ; then + echo "Can not use extended and perl regex at the same time" + exit "$STATE_UNKNOWN" +fi + +GREP="grep" + +if [ $ERE ]; then + GREP="grep -E" +fi + +if [ $PRE ]; then + GREP="grep -P" +fi + # If the source log file doesn't exist, exit -if [ ! -e $logfile ]; then +if [ ! -e "$logfile" ]; then echo "Log check error: Log file $logfile does not exist!" - exit $STATE_UNKNOWN -elif [ ! -r $logfile ] ; then + exit "$STATE_UNKNOWN" +elif [ ! -r "$logfile" ] ; then echo "Log check error: Log file $logfile is not readable!" - exit $STATE_UNKNOWN + exit "$STATE_UNKNOWN" +fi +# If no oldlog was given this can not work properly, abort then +if [ -z "$oldlog" ]; then + echo "Oldlog parameter is needed" + exit $STATE_UNKNOWN fi # If the old log file doesn't exist, this must be the first time # we're running this test, so copy the original log file over to # the old diff file and exit -if [ ! -e $oldlog ]; then - cat $logfile > $oldlog +if [ ! -e "$oldlog" ]; then + cat "$logfile" > "$oldlog" echo "Log check data initialized..." - exit $STATE_OK + exit "$STATE_OK" fi # The old log file exists, so compare it to the original log now @@ -180,31 +232,42 @@ fi # The temporary file that the script should use while # processing the log file. if [ -x /bin/mktemp ]; then - tempdiff=`/bin/mktemp /tmp/check_log.XXXXXXXXXX` + + tempdiff=$(/bin/mktemp /tmp/check_log.XXXXXXXXXX) else - tempdiff=`/bin/date '+%H%M%S'` + tempdiff=$(/bin/date '+%H%M%S') tempdiff="/tmp/check_log.${tempdiff}" - touch $tempdiff - chmod 600 $tempdiff + touch "$tempdiff" + chmod 600 "$tempdiff" fi -diff $logfile $oldlog | grep -v "^>" > $tempdiff +diff "$logfile" "$oldlog" | grep -v "^>" > "$tempdiff" -# Count the number of matching log entries we have -count=`grep -c "$query" $tempdiff` -# Get the last matching entry in the diff file -lastentry=`grep "$query" $tempdiff | tail -1` +if [ $ALL ]; then + # Get the last matching entry in the diff file + entry=$($GREP "$query" "$tempdiff") -rm -f $tempdiff -cat $logfile > $oldlog + # Count the number of matching log entries we have + count=$(echo "$entry" | wc -l) + +else + # Count the number of matching log entries we have + count=$($GREP -c "$query" "$tempdiff") + + # Get the last matching entry in the diff file + entry=$($GREP "$query" "$tempdiff" | tail -1) +fi + +rm -f "$tempdiff" +cat "$logfile" > "$oldlog" if [ "$count" = "0" ]; then # no matches, exit with no error echo "Log check ok - 0 pattern matches found" exitstatus=$STATE_OK -else # Print total matche count and the last entry we found - echo "($count) $lastentry" +else # Print total match count and the last entry we found + echo "($count) $entry" exitstatus=$STATE_CRITICAL fi -exit $exitstatus +exit "$exitstatus" diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl index aac1310..4c72332 100755 --- a/plugins-scripts/check_mailq.pl +++ b/plugins-scripts/check_mailq.pl @@ -28,9 +28,9 @@ use POSIX; use strict; use Getopt::Long; -use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s - $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq @lines - %srcdomains %dstdomains); +use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c $opt_t $opt_s $opt_d + $opt_M $mailq $status $state $msg $msg_q $msg_p $opt_W $opt_C $mailq $mailq_args + @lines %srcdomains %dstdomains); use FindBin; use lib "$FindBin::Bin"; use utils qw(%ERRORS &print_revision &support &usage ); @@ -48,6 +48,8 @@ $PROGNAME = "check_mailq"; $mailq = 'sendmail'; # default $msg_q = 0 ; $msg_p = 0 ; +# If appended, must start with a space +$mailq_args = '' ; $state = $ERRORS{'UNKNOWN'}; Getopt::Long::Configure('bundling'); @@ -68,6 +70,10 @@ if ($opt_s) { $sudo = ""; } +if ($opt_d) { + $mailq_args = $mailq_args . ' -C ' . $opt_d; +} + $SIG{'ALRM'} = sub { print ("ERROR: timed out waiting for $utils::PATH_TO_MAILQ \n"); exit $ERRORS{"WARNING"}; @@ -309,8 +315,8 @@ elsif ( $mailq eq "postfix" ) { ## open mailq if ( defined $utils::PATH_TO_MAILQ && -x $utils::PATH_TO_MAILQ ) { - if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ | " ) ) { - print "ERROR: could not open $utils::PATH_TO_MAILQ \n"; + if (! open (MAILQ, "$sudo $utils::PATH_TO_MAILQ$mailq_args | " ) ) { + print "ERROR: could not open $utils::PATH_TO_MAILQ$mailq_args \n"; exit $ERRORS{'UNKNOWN'}; } }elsif( defined $utils::PATH_TO_MAILQ){ @@ -330,7 +336,7 @@ elsif ( $mailq eq "postfix" ) { close MAILQ; if ( $? ) { - print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ",$/; + print "CRITICAL: Error code ".($?>>8)." returned from $utils::PATH_TO_MAILQ$mailq_args",$/; exit $ERRORS{CRITICAL}; } @@ -343,7 +349,7 @@ elsif ( $mailq eq "postfix" ) { }elsif ($lines[0]=~/Mail queue is empty/) { $msg_q = 0; }else{ - print "Couldn't match $utils::PATH_TO_MAILQ output\n"; + print "Couldn't match $utils::PATH_TO_MAILQ$mailq_args output\n"; exit $ERRORS{'UNKNOWN'}; } @@ -533,7 +539,7 @@ elsif ( $mailq eq "nullmailer" ) { while () { #2006-06-22 16:00:00 282 bytes - if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-2][0-9]\:[0-2][0-9]\s{2}[0-9]+\sbytes$/) { + if (/^[1-9][0-9]*-[01][0-9]-[0-3][0-9]\s[0-2][0-9]\:[0-5][0-9]\:[0-5][0-9]\s+[0-9]+\sbytes/) { $msg_q++ ; } } @@ -561,16 +567,17 @@ exit $state; sub process_arguments(){ GetOptions - ("V" => \$opt_V, "version" => \$opt_V, - "v" => \$opt_v, "verbose" => \$opt_v, - "h" => \$opt_h, "help" => \$opt_h, + ("V" => \$opt_V, "version" => \$opt_V, + "v" => \$opt_v, "verbose" => \$opt_v, + "h" => \$opt_h, "help" => \$opt_h, "M:s" => \$opt_M, "mailserver:s" => \$opt_M, # mailserver (default sendmail) "w=i" => \$opt_w, "warning=i" => \$opt_w, # warning if above this number - "c=i" => \$opt_c, "critical=i" => \$opt_c, # critical if above this number + "c=i" => \$opt_c, "critical=i" => \$opt_c, # critical if above this number + "W=i" => \$opt_W, "warning-domain=i" => \$opt_W, # Warning if above this number + "C=i" => \$opt_C, "critical-domain=i" => \$opt_C, # Critical if above this number "t=i" => \$opt_t, "timeout=i" => \$opt_t, "s" => \$opt_s, "sudo" => \$opt_s, - "W=i" => \$opt_W, # warning if above this number - "C=i" => \$opt_C, # critical if above this number + "d:s" => \$opt_d, "configdir:s" => \$opt_d, ); if ($opt_V) { @@ -651,7 +658,7 @@ sub process_arguments(){ } sub print_usage () { - print "Usage: $PROGNAME -w -c [-W ] [-C ] [-M ] [-t ] [-s] [-v]\n"; + print "Usage: $PROGNAME -w -c [-W ] [-C ] [-M ] [-t ] [-s] [-d ] [-v]\n"; } sub print_help () { @@ -664,14 +671,15 @@ sub print_help () { print " Feedback/patches to support non-sendmail mailqueue welcome\n\n"; print "-w (--warning) = Min. number of messages in queue to generate warning\n"; print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n"; - print "-W = Min. number of messages for same domain in queue to generate warning\n"; - print "-C = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; + print "-W (--warning-domain) = Min. number of messages for same domain in queue to generate warning\n"; + print "-C (--critical-domain) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n"; print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n"; print "-M (--mailserver) = [ sendmail | qmail | postfix | exim | nullmailer ] (default = autodetect)\n"; print "-s (--sudo) = Use sudo to call the mailq command\n"; + print "-d (--configdir) = Config file or directory\n"; print "-h (--help)\n"; print "-V (--version)\n"; - print "-v (--verbose) = debugging output\n"; + print "-v (--verbose) = debugging output\n"; print "\n\n"; print "Note: -w and -c are required arguments. -W and -C are optional.\n"; print " -W and -C are applied to domains listed on the queues - both FROM and TO. (sendmail)\n"; diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh index 96078ac..b14ec50 100755 --- a/plugins-scripts/check_oracle.sh +++ b/plugins-scripts/check_oracle.sh @@ -8,11 +8,11 @@ PATH="@TRUSTED_PATH@" export PATH -PROGNAME=`basename $0` -PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` +PROGNAME=$(basename "$0") +PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,') REVISION="@NP_VERSION@" -. $PROGPATH/utils.sh +. "$PROGPATH"/utils.sh print_usage() { @@ -29,7 +29,7 @@ print_usage() { } print_help() { - print_revision $PROGNAME $REVISION + print_revision "$PROGNAME" "$REVISION" echo "" print_usage echo "" @@ -87,47 +87,47 @@ esac case "$cmd" in --help) print_help - exit $STATE_OK + exit "$STATE_OK" ;; -h) print_help - exit $STATE_OK + exit "$STATE_OK" ;; --version) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; -V) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; esac # Hunt down a reasonable ORACLE_HOME if [ -z "$ORACLE_HOME" ] ; then - # Adjust to taste - for oratab in /var/opt/oracle/oratab /etc/oratab - do - [ ! -f $oratab ] && continue - ORACLE_HOME=`IFS=: - while read SID ORACLE_HOME junk; - do - if [ "$SID" = "$2" -o "$SID" = "*" ] ; then - echo $ORACLE_HOME; - exit; - fi; - done < $oratab` - [ -n "$ORACLE_HOME" ] && break - done + # Adjust to taste + for oratab in /var/opt/oracle/oratab /etc/oratab + do + [ ! -f $oratab ] && continue + ORACLE_HOME=`IFS=: + while read -r SID ORACLE_HOME junk; + do + if [ "$SID" = "$2" ] || [ "$SID" = "*" ] ; then + echo "$ORACLE_HOME"; + exit; + fi; + done < $oratab` + [ -n "$ORACLE_HOME" ] && break + done fi # Last resort -[ -z "$ORACLE_HOME" -a -d $PROGPATH/oracle ] && ORACLE_HOME=$PROGPATH/oracle +[ -z "$ORACLE_HOME" ] && [ -d "$PROGPATH"/oracle ] && ORACLE_HOME=$PROGPATH/oracle if [ "$cmd" != "--db" ]; then - if [ -z "$ORACLE_HOME" -o ! -d "$ORACLE_HOME" ] ; then - echo "Cannot determine ORACLE_HOME for sid $2" - exit $STATE_UNKNOWN - fi + if [ -z "$ORACLE_HOME" ] || [ ! -d "$ORACLE_HOME" ] ; then + echo "Cannot determine ORACLE_HOME for sid $2" + exit "$STATE_UNKNOWN" + fi fi PATH=$PATH:$ORACLE_HOME/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ORACLE_HOME/lib @@ -135,81 +135,81 @@ export ORACLE_HOME PATH LD_LIBRARY_PATH case "$cmd" in --tns) - tnschk=` tnsping $2` - tnschk2=` echo $tnschk | grep -c OK` - if [ ${tnschk2} -eq 1 ] ; then - tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*} - echo "OK - reply time ${tnschk3} from $2" - exit $STATE_OK + tnschk=$(tnsping "$2") + tnschk2=$(echo "$tnschk" | grep -c OK) + if [ "${tnschk2}" -eq 1 ] ; then + tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*} + echo "OK - reply time ${tnschk3} from $2" + exit "$STATE_OK" else - echo "No TNS Listener on $2" - exit $STATE_CRITICAL + echo "No TNS Listener on $2" + exit "$STATE_CRITICAL" fi ;; --oranames) - namesctl status $2 | awk ' + namesctl status "$2" | awk ' /Server has been running for:/ { - msg = "OK: Up" - for (i = 6; i <= NF; i++) { - msg = msg " " $i - } - status = '$STATE_OK' + msg = "OK: Up" + for (i = 6; i <= NF; i++) { + msg = msg " " $i + } + status = '"$STATE_OK"' } /error/ { - msg = "CRITICAL: " $0 - status = '$STATE_CRITICAL' + msg = "CRITICAL: " $0 + status = '"$STATE_CRITICAL"' } END { - print msg - exit status + print msg + exit status }' ;; --db) - pmonchk=`ps -ef | grep -v grep | grep -E -c "(asm|ora)_pmon_${2}$"` - if [ ${pmonchk} -ge 1 ] ; then - echo "${2} OK - ${pmonchk} PMON process(es) running" - exit $STATE_OK + pmonchk=$(pgrep -f "(asm|ora)_pmon_${2}$") + if [ "${pmonchk}" -ge 1 ] ; then + echo "${2} OK - ${pmonchk} PMON process(es) running" + exit "$STATE_OK" #if [ -f $ORACLE_HOME/dbs/sga*${2}* ] ; then - #if [ ${pmonchk} -eq 1 ] ; then + #if [ ${pmonchk} -eq 1 ] ; then #utime=`ls -la $ORACLE_HOME/dbs/sga*$2* | cut -c 43-55` - #echo "${2} OK - running since ${utime}" - #exit $STATE_OK - #fi + #echo "${2} OK - running since ${utime}" + #exit $STATE_OK + #fi else - echo "${2} Database is DOWN" - exit $STATE_CRITICAL + echo "${2} Database is DOWN" + exit "$STATE_CRITICAL" fi ;; --login) - loginchk=`sqlplus dummy/user@$2 < /dev/null` - loginchk2=` echo $loginchk | grep -c ORA-01017` - if [ ${loginchk2} -eq 1 ] ; then - echo "OK - dummy login connected" - exit $STATE_OK + loginchk=$(sqlplus dummy/user@"$2" < /dev/null) + loginchk2=$(echo "$loginchk" | grep -c ORA-01017) + if [ "${loginchk2}" -eq 1 ] ; then + echo "OK - dummy login connected" + exit "$STATE_OK" else - loginchk3=` echo "$loginchk" | grep "ORA-" | head -1` - echo "CRITICAL - $loginchk3" - exit $STATE_CRITICAL + loginchk3=$(echo "$loginchk" | grep "ORA-" | head -1) + echo "CRITICAL - $loginchk3" + exit "$STATE_CRITICAL" fi ;; --connect) - connectchk=`sqlplus $2 < /dev/null` - connectchk2=` echo $connectchk | grep -c ORA-` - if [ ${connectchk2} -eq 0 ] ; then - echo "OK - login successful" - exit $STATE_OK + connectchk=$(sqlplus "$2" < /dev/null) + connectchk2=$(echo "$connectchk" | grep -c ORA-) + if [ "${connectchk2}" -eq 0 ] ; then + echo "OK - login successful" + exit "$STATE_OK" else - connectchk3=` echo "$connectchk" | grep "ORA-" | head -1` - echo "CRITICAL - $connectchk3" - exit $STATE_CRITICAL + connectchk3=$(echo "$connectchk" | grep "ORA-" | head -1) + echo "CRITICAL - $connectchk3" + exit "$STATE_CRITICAL" fi ;; --cache) - if [ ${5} -gt ${6} ] ; then - echo "UNKNOWN - Warning level is less then Crit" - exit $STATE_UNKNOWN + if [ "${5}" -gt "${6}" ] ; then + echo "UNKNOWN - Warning level is less then Crit" + exit "$STATE_UNKNOWN" fi - result=`sqlplus -s ${3}/${4}@${2} << EOF + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select (1-(pr.value/(dbg.value+cg.value)))*100 @@ -219,48 +219,48 @@ and dbg.name='db block gets' and cg.name='consistent gets'; EOF` - if [ -n "`echo $result | grep ORA-`" ] ; then - error=` echo "$result" | grep "ORA-" | head -1` - echo "CRITICAL - $error" - exit $STATE_CRITICAL + if echo "$result" | grep -q 'ORA-' ; then + error=$(echo "$result" | grep "ORA-" | head -1) + echo "CRITICAL - $error" + exit "$STATE_CRITICAL" fi - buf_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` - buf_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` - result=`sqlplus -s ${3}/${4}@${2} << EOF + buf_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}') + buf_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}') + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select sum(lc.pins)/(sum(lc.pins)+sum(lc.reloads))*100 from v\\$librarycache lc; EOF` - - if [ -n "`echo $result | grep ORA-`" ] ; then - error=` echo "$result" | grep "ORA-" | head -1` - echo "CRITICAL - $error" - exit $STATE_CRITICAL + + if echo "$result" | grep -q 'ORA-' ; then + error=$(echo "$result" | grep "ORA-" | head -1) + echo "CRITICAL - $error" + exit "$STATE_CRITICAL" fi - lib_hr=`echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}'` - lib_hrx=`echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}'` + lib_hr=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print int($1)}') + lib_hrx=$(echo "$result" | awk '/^[0-9\. \t]+$/ {print $1}') - if [ $buf_hr -le ${5} -o $lib_hr -le ${5} ] ; then - echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100" - exit $STATE_CRITICAL + if [ "$buf_hr" -le "${5}" ] || [ "$lib_hr" -le "${5}" ] ; then + echo "${2} CRITICAL - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100" + exit "$STATE_CRITICAL" fi - if [ $buf_hr -le ${6} -o $lib_hr -le ${6} ] ; then - echo "${2} WARNING - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100" - exit $STATE_WARNING + if [ "$buf_hr" -le "${6}" ] || [ "$lib_hr" -le "${6}" ] ; then + echo "${2} WARNING - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100" + exit "$STATE_WARNING" fi echo "${2} OK - Cache Hit Rates: $lib_hrx% Lib -- $buf_hrx% Buff|lib=$lib_hrx%;${6};${5};0;100 buffer=$buf_hrx%;${6};${5};0;100" - exit $STATE_OK + exit "$STATE_OK" ;; --tablespace) - if [ ${6} -lt ${7} ] ; then - echo "UNKNOWN - Warning level is more then Crit" - exit $STATE_UNKNOWN + if [ "${6}" -lt "${7}" ] ; then + echo "UNKNOWN - Warning level is more then Crit" + exit "$STATE_UNKNOWN" fi - result=`sqlplus -s ${3}/${4}@${2} << EOF + result=`sqlplus -s "${3}"/"${4}"@"${2}" << EOF set pagesize 0 set numf '9999999.99' select NVL(b.free,0.0),a.total,100 - trunc(NVL(b.free,0.0)/a.total * 1000) / 10 prc @@ -273,32 +273,32 @@ from dba_free_space group by tablespace_name) B ON a.tablespace_name=b.tablespace_name WHERE a.tablespace_name='${5}'; EOF` - if [ -n "`echo $result | grep ORA-`" ] ; then - error=` echo "$result" | grep "ORA-" | head -1` - echo "CRITICAL - $error" - exit $STATE_CRITICAL + if echo "$result" | grep -q 'ORA-' ; then + error=$(echo "$result" | grep "ORA-" | head -1) + echo "CRITICAL - $error" + exit "$STATE_CRITICAL" fi - ts_free=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}'` - ts_total=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}'` - ts_pct=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}'` - ts_pctx=`echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}'` - if [ "$ts_free" -eq 0 -a "$ts_total" -eq 0 -a "$ts_pct" -eq 0 ] ; then + ts_free=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($1)}') + ts_total=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($2)}') + ts_pct=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print int($3)}') + ts_pctx=$(echo "$result" | awk '/^[ 0-9\.\t ]+$/ {print $3}') + if [ "$ts_free" -eq 0 ] && [ "$ts_total" -eq 0 ] && [ "$ts_pct" -eq 0 ] ; then echo "No data returned by Oracle - tablespace $5 not found?" - exit $STATE_UNKNOWN + exit "$STATE_UNKNOWN" fi - if [ "$ts_pct" -ge ${6} ] ; then - echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100" - exit $STATE_CRITICAL + if [ "$ts_pct" -ge "${6}" ] ; then + echo "${2} : ${5} CRITICAL - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100" + exit "$STATE_CRITICAL" fi - if [ "$ts_pct" -ge ${7} ] ; then - echo "${2} : ${5} WARNING - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100" - exit $STATE_WARNING + if [ "$ts_pct" -ge "${7}" ] ; then + echo "${2} : ${5} WARNING - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100" + exit "$STATE_WARNING" fi echo "${2} : ${5} OK - $ts_pctx% used [ $ts_free / $ts_total MB available ]|${5}=$ts_pctx%;${7};${6};0;100" - exit $STATE_OK + exit "$STATE_OK" ;; *) print_usage - exit $STATE_UNKNOWN + exit "$STATE_UNKNOWN" esac diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh index f742830..921e7b3 100755 --- a/plugins-scripts/check_sensors.sh +++ b/plugins-scripts/check_sensors.sh @@ -2,57 +2,57 @@ PATH="@TRUSTED_PATH@" export PATH -PROGNAME=`basename $0` -PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` +PROGNAME=$(basename "$0") +PROGPATH=$(echo "$0" | sed -e 's,[\\/][^\\/][^\\/]*$,,') REVISION="@NP_VERSION@" -. $PROGPATH/utils.sh +. "$PROGPATH"/utils.sh print_usage() { echo "Usage: $PROGNAME" [--ignore-fault] } print_help() { - print_revision $PROGNAME $REVISION + print_revision "$PROGNAME" "$REVISION" echo "" print_usage echo "" echo "This plugin checks hardware status using the lm_sensors package." echo "" support - exit $STATE_OK + exit "$STATE_OK" } case "$1" in --help) print_help - exit $STATE_OK + exit "$STATE_OK" ;; -h) print_help - exit $STATE_OK + exit "$STATE_OK" ;; --version) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; -V) - print_revision $PROGNAME $REVISION - exit $STATE_OK + print_revision "$PROGNAME" "$REVISION" + exit "$STATE_OK" ;; *) - sensordata=`sensors 2>&1` + sensordata=$(sensors 2>&1) status=$? if test ${status} -eq 127; then text="SENSORS UNKNOWN - command not found (did you install lmsensors?)" exit=$STATE_UNKNOWN - elif test ${status} -ne 0; then + elif test "${status}" -ne 0; then text="WARNING - sensors returned state $status" exit=$STATE_WARNING - elif echo ${sensordata} | egrep ALARM > /dev/null; then + elif echo "${sensordata}" | grep -E ALARM > /dev/null; then text="SENSOR CRITICAL - Sensor alarm detected!" exit=$STATE_CRITICAL - elif echo ${sensordata} | egrep FAULT > /dev/null \ + elif echo "${sensordata}" | grep -E FAULT > /dev/null \ && test "$1" != "-i" -a "$1" != "--ignore-fault"; then text="SENSOR UNKNOWN - Sensor reported fault" exit=$STATE_UNKNOWN @@ -63,8 +63,8 @@ case "$1" in echo "$text" if test "$1" = "-v" -o "$1" = "--verbose"; then - echo ${sensordata} + echo "${sensordata}" fi - exit $exit + exit "$exit" ;; esac diff --git a/plugins-scripts/check_uptime.pl b/plugins-scripts/check_uptime.pl index 4c9f22d..f954287 100755 --- a/plugins-scripts/check_uptime.pl +++ b/plugins-scripts/check_uptime.pl @@ -25,7 +25,7 @@ use POSIX; use strict; use Getopt::Long; use vars qw($opt_V $opt_h $opt_v $verbose $PROGNAME $opt_w $opt_c - $opt_f $opt_s + $opt_f $opt_s $opt_d $lower_warn_threshold $upper_warn_threshold $lower_crit_threshold $upper_crit_threshold $status $state $msg); @@ -137,9 +137,20 @@ if ( $uptime_seconds > $upper_crit_threshold ) { $state_str = "OK"; } +# Prepare uptime value (seconds or days) +my $uptime_text = ""; +my $uptime_unit = ""; +if ( $opt_d ) { + $uptime_text = floor($uptime_seconds / 60 / 60 / 24); + $uptime_unit = "days"; +} else { + $uptime_text = $uptime_seconds; + $uptime_unit = "seconds"; +} + $msg = "$state_str: "; -$msg .= "uptime is $uptime_seconds seconds. "; +$msg .= "Uptime is $uptime_text $uptime_unit. "; $msg .= "Exceeds $out_of_bounds_text threshold. " if $out_of_bounds_text; $msg .= "Running for $pretty_uptime. " if $opt_f; if ( $opt_s ) { @@ -167,6 +178,7 @@ sub process_arguments(){ "c=s" => \$opt_c, "critical=s" => \$opt_c, # critical if above this number "f" => \$opt_f, "for" => \$opt_f, # show "running for ..." "s" => \$opt_s, "since" => \$opt_s, # show "running since ..." + "d" => \$opt_d, "days" => \$opt_d, # report uptime in days ); if ($opt_V) { @@ -262,6 +274,7 @@ sub print_help () { print "-c (--critical) = Min. number of uptime to generate critical alert ( w < c )\n"; print "-f (--for) = Show uptime in a pretty format (Running for x weeks, x days, ...)\n"; print "-s (--since) = Show last boot in yyyy-mm-dd HH:MM:SS format (output from 'uptime -s')\n"; + print "-d (--days) = Show uptime in days\n"; print "-h (--help)\n"; print "-V (--version)\n"; print "-v (--verbose) = debugging output\n"; diff --git a/plugins-scripts/t/check_uptime.t b/plugins-scripts/t/check_uptime.t index c395307..6e81db3 100644 --- a/plugins-scripts/t/check_uptime.t +++ b/plugins-scripts/t/check_uptime.t @@ -5,7 +5,7 @@ # use strict; -use Test::More tests => 40; +use Test::More tests => 42; use NPTest; my $result; @@ -45,30 +45,36 @@ $result = NPTest->testCmd( cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" ); like ( $result->output, '/Running since \d+/', "Output for the s parameter correct" ); +$result = NPTest->testCmd( + "./check_uptime -d -w 1 -c 2" + ); +cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" ); +like ( $result->output, '/CRITICAL: Uptime is \d+ days/', "Output for the d parameter correct" ); + $result = NPTest->testCmd( "./check_uptime -w 1 -c 2" ); cmp_ok( $result->return_code, '==', 2, "Uptime higher than 2 seconds" ); -like ( $result->output, '/^CRITICAL: uptime is \d+ seconds/', "Output for uptime higher than 2 seconds correct" ); +like ( $result->output, '/^CRITICAL: Uptime is \d+ seconds/', "Output for uptime higher than 2 seconds correct" ); $result = NPTest->testCmd( "./check_uptime -w 1 -c 9999w" ); cmp_ok( $result->return_code, '==', 1, "Uptime lower than 9999 weeks" ); -like ( $result->output, '/^WARNING: uptime is \d+ seconds/', "Output for uptime lower than 9999 weeks correct" ); +like ( $result->output, '/^WARNING: Uptime is \d+ seconds/', "Output for uptime lower than 9999 weeks correct" ); $result = NPTest->testCmd( "./check_uptime -w 9998w -c 9999w" ); cmp_ok( $result->return_code, '==', 0, "Uptime lower than 9998 weeks" ); -like ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 9998 weeks correct" ); +like ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 9998 weeks correct" ); like ( $result->output, '/\|uptime=[0-9]+s;6046790400;6047395200;/', "Checking for performance output" ); $result = NPTest->testCmd( "./check_uptime -w 111222d -c 222333d" ); cmp_ok( $result->return_code, '==', 0, "Uptime lower than 111222 days" ); -like ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 111222 days correct" ); +like ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 111222 days correct" ); like ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" ); # Same as before, hopefully uptime is higher than 2 seconds so no warning @@ -76,7 +82,7 @@ $result = NPTest->testCmd( "./check_uptime -w 2:111222d -c 1:222333d" ); cmp_ok( $result->return_code, '==', 0, "Uptime lower than 111222 days, and higher 2 seconds" ); -like ( $result->output, '/^OK: uptime is \d+ seconds/', "Output for uptime lower than 111222 days, and higher 2 seconds correct" ); +like ( $result->output, '/^OK: Uptime is \d+ seconds/', "Output for uptime lower than 111222 days, and higher 2 seconds correct" ); like ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" ); # Same as before, now the low warning should trigger @@ -84,7 +90,7 @@ $result = NPTest->testCmd( "./check_uptime -w 111221d:111222d -c 1:222333d" ); cmp_ok( $result->return_code, '==', 1, "Uptime lower than 111221 days raises warning" ); -like ( $result->output, '/^WARNING: uptime is \d+ seconds/', "Output for uptime lower than 111221 days correct" ); +like ( $result->output, '/^WARNING: Uptime is \d+ seconds/', "Output for uptime lower than 111221 days correct" ); like ( $result->output, '/Exceeds lower warn threshold/', "Exceeds text correct" ); like ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" ); @@ -93,7 +99,7 @@ $result = NPTest->testCmd( "./check_uptime -w 111221d:111222d -c 111220d:222333d" ); cmp_ok( $result->return_code, '==', 2, "Uptime lower than 111220 days raises critical" ); -like ( $result->output, '/^CRITICAL: uptime is \d+ seconds/', "Output for uptime lower than 111220 days correct" ); +like ( $result->output, '/^CRITICAL: Uptime is \d+ seconds/', "Output for uptime lower than 111220 days correct" ); like ( $result->output, '/Exceeds lower crit threshold/', "Exceeds text correct" ); like ( $result->output, '/\|uptime=[0-9]+s;9609580800;19209571200;/', "Checking for performance output" ); diff --git a/plugins/Makefile.in b/plugins/Makefile.in index b3e9aff..1fd7907 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,7 +106,6 @@ EXTRA_PROGRAMS = check_mysql$(EXEEXT) check_radius$(EXEEXT) \ check_dbi$(EXEEXT) check_curl$(EXEEXT) @HAVE_UTMPX_FALSE@am__append_1 = popen.o subdir = plugins -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -172,22 +208,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +am__installdirs = "$(DESTDIR)$(libexecdir)" +PROGRAMS = $(libexec_PROGRAMS) LIBRARIES = $(noinst_LIBRARIES) +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libnpcommon_a_AR = $(AR) $(ARFLAGS) libnpcommon_a_LIBADD = am_libnpcommon_a_OBJECTS = utils.$(OBJEXT) netutils.$(OBJEXT) \ sslutils.$(OBJEXT) runcmd.$(OBJEXT) popen.$(OBJEXT) \ runcmd.$(OBJEXT) libnpcommon_a_OBJECTS = $(am_libnpcommon_a_OBJECTS) -am__installdirs = "$(DESTDIR)$(libexecdir)" -PROGRAMS = $(libexec_PROGRAMS) check_apt_SOURCES = check_apt.c check_apt_OBJECTS = check_apt.$(OBJEXT) check_apt_DEPENDENCIES = $(BASEOBJS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = check_by_ssh_SOURCES = check_by_ssh.c check_by_ssh_OBJECTS = check_by_ssh.$(OBJEXT) am__DEPENDENCIES_1 = @@ -204,7 +249,7 @@ am__DEPENDENCIES_4 = $(BASEOBJS) $(am__DEPENDENCIES_3) \ check_curl_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_4) $(am__DEPENDENCIES_1) \ picohttpparser/libpicohttpparser.a -check_curl_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +check_curl_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_curl_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ check_dbi_SOURCES = check_dbi.c @@ -260,7 +305,7 @@ check_mysql_OBJECTS = check_mysql-check_mysql.$(OBJEXT) am__DEPENDENCIES_10 = $(check_mrtgtraf_LDADD) $(am__DEPENDENCIES_1) check_mysql_DEPENDENCIES = $(am__DEPENDENCIES_10) \ $(am__DEPENDENCIES_1) -check_mysql_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +check_mysql_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(check_mysql_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ check_mysql_query_SOURCES = check_mysql_query.c @@ -268,8 +313,8 @@ check_mysql_query_OBJECTS = \ check_mysql_query-check_mysql_query.$(OBJEXT) check_mysql_query_DEPENDENCIES = $(am__DEPENDENCIES_10) \ $(am__DEPENDENCIES_1) -check_mysql_query_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) \ +check_mysql_query_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(check_mysql_query_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ check_nagios_SOURCES = check_nagios.c @@ -350,19 +395,66 @@ negate_DEPENDENCIES = $(BASEOBJS) urlize_SOURCES = urlize.c urlize_OBJECTS = urlize.$(OBJEXT) urlize_DEPENDENCIES = $(BASEOBJS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/check_apt.Po \ + ./$(DEPDIR)/check_by_ssh.Po ./$(DEPDIR)/check_cluster.Po \ + ./$(DEPDIR)/check_curl-check_curl.Po ./$(DEPDIR)/check_dbi.Po \ + ./$(DEPDIR)/check_dig.Po ./$(DEPDIR)/check_disk.Po \ + ./$(DEPDIR)/check_dns.Po ./$(DEPDIR)/check_dummy.Po \ + ./$(DEPDIR)/check_fping.Po ./$(DEPDIR)/check_game.Po \ + ./$(DEPDIR)/check_hpjd.Po ./$(DEPDIR)/check_http.Po \ + ./$(DEPDIR)/check_ide_smart.Po ./$(DEPDIR)/check_ldap.Po \ + ./$(DEPDIR)/check_load.Po ./$(DEPDIR)/check_mrtg.Po \ + ./$(DEPDIR)/check_mrtgtraf.Po \ + ./$(DEPDIR)/check_mysql-check_mysql.Po \ + ./$(DEPDIR)/check_mysql_query-check_mysql_query.Po \ + ./$(DEPDIR)/check_nagios.Po ./$(DEPDIR)/check_nt.Po \ + ./$(DEPDIR)/check_ntp.Po ./$(DEPDIR)/check_ntp_peer.Po \ + ./$(DEPDIR)/check_ntp_time.Po ./$(DEPDIR)/check_nwstat.Po \ + ./$(DEPDIR)/check_overcr.Po ./$(DEPDIR)/check_pgsql.Po \ + ./$(DEPDIR)/check_ping.Po ./$(DEPDIR)/check_procs.Po \ + ./$(DEPDIR)/check_radius.Po ./$(DEPDIR)/check_real.Po \ + ./$(DEPDIR)/check_smtp.Po ./$(DEPDIR)/check_snmp.Po \ + ./$(DEPDIR)/check_ssh.Po ./$(DEPDIR)/check_swap.Po \ + ./$(DEPDIR)/check_tcp.Po ./$(DEPDIR)/check_time.Po \ + ./$(DEPDIR)/check_ups.Po ./$(DEPDIR)/check_users.Po \ + ./$(DEPDIR)/negate.Po ./$(DEPDIR)/netutils.Po \ + ./$(DEPDIR)/popen.Po ./$(DEPDIR)/runcmd.Po \ + ./$(DEPDIR)/sslutils.Po ./$(DEPDIR)/urlize.Po \ + ./$(DEPDIR)/utils.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libnpcommon_a_SOURCES) check_apt.c check_by_ssh.c \ check_cluster.c check_curl.c check_dbi.c check_dig.c \ check_disk.c check_dns.c check_dummy.c check_fping.c \ @@ -385,13 +477,14 @@ DIST_SOURCES = $(libnpcommon_a_SOURCES) check_apt.c check_by_ssh.c \ check_radius.c check_real.c check_smtp.c check_snmp.c \ check_ssh.c check_swap.c check_tcp.c check_time.c check_ups.c \ check_users.c negate.c urlize.c -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -399,14 +492,238 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + check recheck distdir distdir-am +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs \ + $(top_srcdir)/build-aux/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -439,6 +756,7 @@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1566,6 +1884,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1650,7 +1969,7 @@ urlize_LDADD = $(BASEOBJS) all: all-recursive .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -1663,14 +1982,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1681,13 +1999,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libnpcommon.a: $(libnpcommon_a_OBJECTS) $(libnpcommon_a_DEPENDENCIES) $(EXTRA_libnpcommon_a_DEPENDENCIES) - -rm -f libnpcommon.a - $(libnpcommon_a_AR) libnpcommon.a $(libnpcommon_a_OBJECTS) $(libnpcommon_a_LIBADD) - $(RANLIB) libnpcommon.a install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ @@ -1697,10 +2008,12 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -1721,7 +2034,8 @@ uninstall-libexecPROGRAMS: @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(libexecdir)" && rm -f $$files @@ -1734,132 +2048,182 @@ clean-libexecPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + +clean-noinstLIBRARIES: + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + +libnpcommon.a: $(libnpcommon_a_OBJECTS) $(libnpcommon_a_DEPENDENCIES) $(EXTRA_libnpcommon_a_DEPENDENCIES) + $(AM_V_at)-rm -f libnpcommon.a + $(AM_V_AR)$(libnpcommon_a_AR) libnpcommon.a $(libnpcommon_a_OBJECTS) $(libnpcommon_a_LIBADD) + $(AM_V_at)$(RANLIB) libnpcommon.a + check_apt$(EXEEXT): $(check_apt_OBJECTS) $(check_apt_DEPENDENCIES) $(EXTRA_check_apt_DEPENDENCIES) @rm -f check_apt$(EXEEXT) - $(LINK) $(check_apt_OBJECTS) $(check_apt_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_apt_OBJECTS) $(check_apt_LDADD) $(LIBS) + check_by_ssh$(EXEEXT): $(check_by_ssh_OBJECTS) $(check_by_ssh_DEPENDENCIES) $(EXTRA_check_by_ssh_DEPENDENCIES) @rm -f check_by_ssh$(EXEEXT) - $(LINK) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_by_ssh_OBJECTS) $(check_by_ssh_LDADD) $(LIBS) + check_cluster$(EXEEXT): $(check_cluster_OBJECTS) $(check_cluster_DEPENDENCIES) $(EXTRA_check_cluster_DEPENDENCIES) @rm -f check_cluster$(EXEEXT) - $(LINK) $(check_cluster_OBJECTS) $(check_cluster_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_cluster_OBJECTS) $(check_cluster_LDADD) $(LIBS) + check_curl$(EXEEXT): $(check_curl_OBJECTS) $(check_curl_DEPENDENCIES) $(EXTRA_check_curl_DEPENDENCIES) @rm -f check_curl$(EXEEXT) - $(check_curl_LINK) $(check_curl_OBJECTS) $(check_curl_LDADD) $(LIBS) + $(AM_V_CCLD)$(check_curl_LINK) $(check_curl_OBJECTS) $(check_curl_LDADD) $(LIBS) + check_dbi$(EXEEXT): $(check_dbi_OBJECTS) $(check_dbi_DEPENDENCIES) $(EXTRA_check_dbi_DEPENDENCIES) @rm -f check_dbi$(EXEEXT) - $(LINK) $(check_dbi_OBJECTS) $(check_dbi_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_dbi_OBJECTS) $(check_dbi_LDADD) $(LIBS) + check_dig$(EXEEXT): $(check_dig_OBJECTS) $(check_dig_DEPENDENCIES) $(EXTRA_check_dig_DEPENDENCIES) @rm -f check_dig$(EXEEXT) - $(LINK) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_dig_OBJECTS) $(check_dig_LDADD) $(LIBS) + check_disk$(EXEEXT): $(check_disk_OBJECTS) $(check_disk_DEPENDENCIES) $(EXTRA_check_disk_DEPENDENCIES) @rm -f check_disk$(EXEEXT) - $(LINK) $(check_disk_OBJECTS) $(check_disk_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_disk_OBJECTS) $(check_disk_LDADD) $(LIBS) + check_dns$(EXEEXT): $(check_dns_OBJECTS) $(check_dns_DEPENDENCIES) $(EXTRA_check_dns_DEPENDENCIES) @rm -f check_dns$(EXEEXT) - $(LINK) $(check_dns_OBJECTS) $(check_dns_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_dns_OBJECTS) $(check_dns_LDADD) $(LIBS) + check_dummy$(EXEEXT): $(check_dummy_OBJECTS) $(check_dummy_DEPENDENCIES) $(EXTRA_check_dummy_DEPENDENCIES) @rm -f check_dummy$(EXEEXT) - $(LINK) $(check_dummy_OBJECTS) $(check_dummy_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_dummy_OBJECTS) $(check_dummy_LDADD) $(LIBS) + check_fping$(EXEEXT): $(check_fping_OBJECTS) $(check_fping_DEPENDENCIES) $(EXTRA_check_fping_DEPENDENCIES) @rm -f check_fping$(EXEEXT) - $(LINK) $(check_fping_OBJECTS) $(check_fping_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_fping_OBJECTS) $(check_fping_LDADD) $(LIBS) + check_game$(EXEEXT): $(check_game_OBJECTS) $(check_game_DEPENDENCIES) $(EXTRA_check_game_DEPENDENCIES) @rm -f check_game$(EXEEXT) - $(LINK) $(check_game_OBJECTS) $(check_game_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_game_OBJECTS) $(check_game_LDADD) $(LIBS) + check_hpjd$(EXEEXT): $(check_hpjd_OBJECTS) $(check_hpjd_DEPENDENCIES) $(EXTRA_check_hpjd_DEPENDENCIES) @rm -f check_hpjd$(EXEEXT) - $(LINK) $(check_hpjd_OBJECTS) $(check_hpjd_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_hpjd_OBJECTS) $(check_hpjd_LDADD) $(LIBS) + check_http$(EXEEXT): $(check_http_OBJECTS) $(check_http_DEPENDENCIES) $(EXTRA_check_http_DEPENDENCIES) @rm -f check_http$(EXEEXT) - $(LINK) $(check_http_OBJECTS) $(check_http_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_http_OBJECTS) $(check_http_LDADD) $(LIBS) + check_ide_smart$(EXEEXT): $(check_ide_smart_OBJECTS) $(check_ide_smart_DEPENDENCIES) $(EXTRA_check_ide_smart_DEPENDENCIES) @rm -f check_ide_smart$(EXEEXT) - $(LINK) $(check_ide_smart_OBJECTS) $(check_ide_smart_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ide_smart_OBJECTS) $(check_ide_smart_LDADD) $(LIBS) + check_ldap$(EXEEXT): $(check_ldap_OBJECTS) $(check_ldap_DEPENDENCIES) $(EXTRA_check_ldap_DEPENDENCIES) @rm -f check_ldap$(EXEEXT) - $(LINK) $(check_ldap_OBJECTS) $(check_ldap_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ldap_OBJECTS) $(check_ldap_LDADD) $(LIBS) + check_load$(EXEEXT): $(check_load_OBJECTS) $(check_load_DEPENDENCIES) $(EXTRA_check_load_DEPENDENCIES) @rm -f check_load$(EXEEXT) - $(LINK) $(check_load_OBJECTS) $(check_load_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_load_OBJECTS) $(check_load_LDADD) $(LIBS) + check_mrtg$(EXEEXT): $(check_mrtg_OBJECTS) $(check_mrtg_DEPENDENCIES) $(EXTRA_check_mrtg_DEPENDENCIES) @rm -f check_mrtg$(EXEEXT) - $(LINK) $(check_mrtg_OBJECTS) $(check_mrtg_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_mrtg_OBJECTS) $(check_mrtg_LDADD) $(LIBS) + check_mrtgtraf$(EXEEXT): $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_DEPENDENCIES) $(EXTRA_check_mrtgtraf_DEPENDENCIES) @rm -f check_mrtgtraf$(EXEEXT) - $(LINK) $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_mrtgtraf_OBJECTS) $(check_mrtgtraf_LDADD) $(LIBS) + check_mysql$(EXEEXT): $(check_mysql_OBJECTS) $(check_mysql_DEPENDENCIES) $(EXTRA_check_mysql_DEPENDENCIES) @rm -f check_mysql$(EXEEXT) - $(check_mysql_LINK) $(check_mysql_OBJECTS) $(check_mysql_LDADD) $(LIBS) + $(AM_V_CCLD)$(check_mysql_LINK) $(check_mysql_OBJECTS) $(check_mysql_LDADD) $(LIBS) + check_mysql_query$(EXEEXT): $(check_mysql_query_OBJECTS) $(check_mysql_query_DEPENDENCIES) $(EXTRA_check_mysql_query_DEPENDENCIES) @rm -f check_mysql_query$(EXEEXT) - $(check_mysql_query_LINK) $(check_mysql_query_OBJECTS) $(check_mysql_query_LDADD) $(LIBS) + $(AM_V_CCLD)$(check_mysql_query_LINK) $(check_mysql_query_OBJECTS) $(check_mysql_query_LDADD) $(LIBS) + check_nagios$(EXEEXT): $(check_nagios_OBJECTS) $(check_nagios_DEPENDENCIES) $(EXTRA_check_nagios_DEPENDENCIES) @rm -f check_nagios$(EXEEXT) - $(LINK) $(check_nagios_OBJECTS) $(check_nagios_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_nagios_OBJECTS) $(check_nagios_LDADD) $(LIBS) + check_nt$(EXEEXT): $(check_nt_OBJECTS) $(check_nt_DEPENDENCIES) $(EXTRA_check_nt_DEPENDENCIES) @rm -f check_nt$(EXEEXT) - $(LINK) $(check_nt_OBJECTS) $(check_nt_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_nt_OBJECTS) $(check_nt_LDADD) $(LIBS) + check_ntp$(EXEEXT): $(check_ntp_OBJECTS) $(check_ntp_DEPENDENCIES) $(EXTRA_check_ntp_DEPENDENCIES) @rm -f check_ntp$(EXEEXT) - $(LINK) $(check_ntp_OBJECTS) $(check_ntp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ntp_OBJECTS) $(check_ntp_LDADD) $(LIBS) + check_ntp_peer$(EXEEXT): $(check_ntp_peer_OBJECTS) $(check_ntp_peer_DEPENDENCIES) $(EXTRA_check_ntp_peer_DEPENDENCIES) @rm -f check_ntp_peer$(EXEEXT) - $(LINK) $(check_ntp_peer_OBJECTS) $(check_ntp_peer_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ntp_peer_OBJECTS) $(check_ntp_peer_LDADD) $(LIBS) + check_ntp_time$(EXEEXT): $(check_ntp_time_OBJECTS) $(check_ntp_time_DEPENDENCIES) $(EXTRA_check_ntp_time_DEPENDENCIES) @rm -f check_ntp_time$(EXEEXT) - $(LINK) $(check_ntp_time_OBJECTS) $(check_ntp_time_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ntp_time_OBJECTS) $(check_ntp_time_LDADD) $(LIBS) + check_nwstat$(EXEEXT): $(check_nwstat_OBJECTS) $(check_nwstat_DEPENDENCIES) $(EXTRA_check_nwstat_DEPENDENCIES) @rm -f check_nwstat$(EXEEXT) - $(LINK) $(check_nwstat_OBJECTS) $(check_nwstat_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_nwstat_OBJECTS) $(check_nwstat_LDADD) $(LIBS) + check_overcr$(EXEEXT): $(check_overcr_OBJECTS) $(check_overcr_DEPENDENCIES) $(EXTRA_check_overcr_DEPENDENCIES) @rm -f check_overcr$(EXEEXT) - $(LINK) $(check_overcr_OBJECTS) $(check_overcr_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_overcr_OBJECTS) $(check_overcr_LDADD) $(LIBS) + check_pgsql$(EXEEXT): $(check_pgsql_OBJECTS) $(check_pgsql_DEPENDENCIES) $(EXTRA_check_pgsql_DEPENDENCIES) @rm -f check_pgsql$(EXEEXT) - $(LINK) $(check_pgsql_OBJECTS) $(check_pgsql_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_pgsql_OBJECTS) $(check_pgsql_LDADD) $(LIBS) + check_ping$(EXEEXT): $(check_ping_OBJECTS) $(check_ping_DEPENDENCIES) $(EXTRA_check_ping_DEPENDENCIES) @rm -f check_ping$(EXEEXT) - $(LINK) $(check_ping_OBJECTS) $(check_ping_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ping_OBJECTS) $(check_ping_LDADD) $(LIBS) + check_procs$(EXEEXT): $(check_procs_OBJECTS) $(check_procs_DEPENDENCIES) $(EXTRA_check_procs_DEPENDENCIES) @rm -f check_procs$(EXEEXT) - $(LINK) $(check_procs_OBJECTS) $(check_procs_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_procs_OBJECTS) $(check_procs_LDADD) $(LIBS) + check_radius$(EXEEXT): $(check_radius_OBJECTS) $(check_radius_DEPENDENCIES) $(EXTRA_check_radius_DEPENDENCIES) @rm -f check_radius$(EXEEXT) - $(LINK) $(check_radius_OBJECTS) $(check_radius_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_radius_OBJECTS) $(check_radius_LDADD) $(LIBS) + check_real$(EXEEXT): $(check_real_OBJECTS) $(check_real_DEPENDENCIES) $(EXTRA_check_real_DEPENDENCIES) @rm -f check_real$(EXEEXT) - $(LINK) $(check_real_OBJECTS) $(check_real_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_real_OBJECTS) $(check_real_LDADD) $(LIBS) + check_smtp$(EXEEXT): $(check_smtp_OBJECTS) $(check_smtp_DEPENDENCIES) $(EXTRA_check_smtp_DEPENDENCIES) @rm -f check_smtp$(EXEEXT) - $(LINK) $(check_smtp_OBJECTS) $(check_smtp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_smtp_OBJECTS) $(check_smtp_LDADD) $(LIBS) + check_snmp$(EXEEXT): $(check_snmp_OBJECTS) $(check_snmp_DEPENDENCIES) $(EXTRA_check_snmp_DEPENDENCIES) @rm -f check_snmp$(EXEEXT) - $(LINK) $(check_snmp_OBJECTS) $(check_snmp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_snmp_OBJECTS) $(check_snmp_LDADD) $(LIBS) + check_ssh$(EXEEXT): $(check_ssh_OBJECTS) $(check_ssh_DEPENDENCIES) $(EXTRA_check_ssh_DEPENDENCIES) @rm -f check_ssh$(EXEEXT) - $(LINK) $(check_ssh_OBJECTS) $(check_ssh_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ssh_OBJECTS) $(check_ssh_LDADD) $(LIBS) + check_swap$(EXEEXT): $(check_swap_OBJECTS) $(check_swap_DEPENDENCIES) $(EXTRA_check_swap_DEPENDENCIES) @rm -f check_swap$(EXEEXT) - $(LINK) $(check_swap_OBJECTS) $(check_swap_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_swap_OBJECTS) $(check_swap_LDADD) $(LIBS) + check_tcp$(EXEEXT): $(check_tcp_OBJECTS) $(check_tcp_DEPENDENCIES) $(EXTRA_check_tcp_DEPENDENCIES) @rm -f check_tcp$(EXEEXT) - $(LINK) $(check_tcp_OBJECTS) $(check_tcp_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_tcp_OBJECTS) $(check_tcp_LDADD) $(LIBS) + check_time$(EXEEXT): $(check_time_OBJECTS) $(check_time_DEPENDENCIES) $(EXTRA_check_time_DEPENDENCIES) @rm -f check_time$(EXEEXT) - $(LINK) $(check_time_OBJECTS) $(check_time_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_time_OBJECTS) $(check_time_LDADD) $(LIBS) + check_ups$(EXEEXT): $(check_ups_OBJECTS) $(check_ups_DEPENDENCIES) $(EXTRA_check_ups_DEPENDENCIES) @rm -f check_ups$(EXEEXT) - $(LINK) $(check_ups_OBJECTS) $(check_ups_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_ups_OBJECTS) $(check_ups_LDADD) $(LIBS) + check_users$(EXEEXT): $(check_users_OBJECTS) $(check_users_DEPENDENCIES) $(EXTRA_check_users_DEPENDENCIES) @rm -f check_users$(EXEEXT) - $(LINK) $(check_users_OBJECTS) $(check_users_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(check_users_OBJECTS) $(check_users_LDADD) $(LIBS) + negate$(EXEEXT): $(negate_OBJECTS) $(negate_DEPENDENCIES) $(EXTRA_negate_DEPENDENCIES) @rm -f negate$(EXEEXT) - $(LINK) $(negate_OBJECTS) $(negate_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(negate_OBJECTS) $(negate_LDADD) $(LIBS) + urlize$(EXEEXT): $(urlize_OBJECTS) $(urlize_DEPENDENCIES) $(EXTRA_urlize_DEPENDENCIES) @rm -f urlize$(EXEEXT) - $(LINK) $(urlize_OBJECTS) $(urlize_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(urlize_OBJECTS) $(urlize_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1867,116 +2231,122 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_apt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_by_ssh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_cluster.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_curl-check_curl.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dbi.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dig.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_disk.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dns.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dummy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fping.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_game.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_hpjd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_http.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ide_smart.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ldap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_load.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtgtraf.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mysql-check_mysql.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mysql_query-check_mysql_query.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nagios.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp_peer.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp_time.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nwstat.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_overcr.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pgsql.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ping.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_procs.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_radius.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_real.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_smtp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_snmp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ssh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_swap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tcp.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_time.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ups.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_users.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negate.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netutils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/popen.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runcmd.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslutils.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlize.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_apt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_by_ssh.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_cluster.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_curl-check_curl.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dbi.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dig.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_disk.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dns.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_dummy.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fping.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_game.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_hpjd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_http.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ide_smart.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ldap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_load.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtg.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mrtgtraf.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mysql-check_mysql.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mysql_query-check_mysql_query.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nagios.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nt.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp_peer.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ntp_time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_nwstat.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_overcr.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_pgsql.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ping.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_procs.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_radius.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_real.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_smtp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_snmp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ssh.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_swap.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_tcp.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_time.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_ups.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_users.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/negate.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netutils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/popen.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/runcmd.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslutils.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/urlize.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utils.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< check_curl-check_curl.o: check_curl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -MT check_curl-check_curl.o -MD -MP -MF $(DEPDIR)/check_curl-check_curl.Tpo -c -o check_curl-check_curl.o `test -f 'check_curl.c' || echo '$(srcdir)/'`check_curl.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_curl-check_curl.Tpo $(DEPDIR)/check_curl-check_curl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_curl.c' object='check_curl-check_curl.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -MT check_curl-check_curl.o -MD -MP -MF $(DEPDIR)/check_curl-check_curl.Tpo -c -o check_curl-check_curl.o `test -f 'check_curl.c' || echo '$(srcdir)/'`check_curl.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_curl-check_curl.Tpo $(DEPDIR)/check_curl-check_curl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_curl.c' object='check_curl-check_curl.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -c -o check_curl-check_curl.o `test -f 'check_curl.c' || echo '$(srcdir)/'`check_curl.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -c -o check_curl-check_curl.o `test -f 'check_curl.c' || echo '$(srcdir)/'`check_curl.c check_curl-check_curl.obj: check_curl.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -MT check_curl-check_curl.obj -MD -MP -MF $(DEPDIR)/check_curl-check_curl.Tpo -c -o check_curl-check_curl.obj `if test -f 'check_curl.c'; then $(CYGPATH_W) 'check_curl.c'; else $(CYGPATH_W) '$(srcdir)/check_curl.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_curl-check_curl.Tpo $(DEPDIR)/check_curl-check_curl.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_curl.c' object='check_curl-check_curl.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -MT check_curl-check_curl.obj -MD -MP -MF $(DEPDIR)/check_curl-check_curl.Tpo -c -o check_curl-check_curl.obj `if test -f 'check_curl.c'; then $(CYGPATH_W) 'check_curl.c'; else $(CYGPATH_W) '$(srcdir)/check_curl.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_curl-check_curl.Tpo $(DEPDIR)/check_curl-check_curl.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_curl.c' object='check_curl-check_curl.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -c -o check_curl-check_curl.obj `if test -f 'check_curl.c'; then $(CYGPATH_W) 'check_curl.c'; else $(CYGPATH_W) '$(srcdir)/check_curl.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_curl_CPPFLAGS) $(CPPFLAGS) $(check_curl_CFLAGS) $(CFLAGS) -c -o check_curl-check_curl.obj `if test -f 'check_curl.c'; then $(CYGPATH_W) 'check_curl.c'; else $(CYGPATH_W) '$(srcdir)/check_curl.c'; fi` check_mysql-check_mysql.o: check_mysql.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.o -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_mysql.c' object='check_mysql-check_mysql.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.o -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_mysql.c' object='check_mysql-check_mysql.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.o `test -f 'check_mysql.c' || echo '$(srcdir)/'`check_mysql.c check_mysql-check_mysql.obj: check_mysql.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.obj -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_mysql.c' object='check_mysql-check_mysql.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -MT check_mysql-check_mysql.obj -MD -MP -MF $(DEPDIR)/check_mysql-check_mysql.Tpo -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_mysql-check_mysql.Tpo $(DEPDIR)/check_mysql-check_mysql.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_mysql.c' object='check_mysql-check_mysql.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_CPPFLAGS) $(CPPFLAGS) $(check_mysql_CFLAGS) $(CFLAGS) -c -o check_mysql-check_mysql.obj `if test -f 'check_mysql.c'; then $(CYGPATH_W) 'check_mysql.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql.c'; fi` check_mysql_query-check_mysql_query.o: check_mysql_query.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.o -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.o -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.o `test -f 'check_mysql_query.c' || echo '$(srcdir)/'`check_mysql_query.c check_mysql_query-check_mysql_query.obj: check_mysql_query.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.obj -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -MT check_mysql_query-check_mysql_query.obj -MD -MP -MF $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_mysql_query-check_mysql_query.Tpo $(DEPDIR)/check_mysql_query-check_mysql_query.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check_mysql_query.c' object='check_mysql_query-check_mysql_query.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(check_mysql_query_CPPFLAGS) $(CPPFLAGS) $(check_mysql_query_CFLAGS) $(CFLAGS) -c -o check_mysql_query-check_mysql_query.obj `if test -f 'check_mysql_query.c'; then $(CYGPATH_W) 'check_mysql_query.c'; else $(CYGPATH_W) '$(srcdir)/check_mysql_query.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -1985,22 +2355,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -2015,57 +2388,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -2081,12 +2409,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -2098,15 +2421,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -2115,104 +2434,185 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< -distdir: $(DISTFILES) +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + elif test -n "$$redo_logs"; then \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) + +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2270,7 +2670,7 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-recursive -all-am: Makefile $(LIBRARIES) $(PROGRAMS) all-local +all-am: Makefile $(PROGRAMS) $(LIBRARIES) all-local installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libexecdir)"; do \ @@ -2296,6 +2696,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -2312,7 +2715,53 @@ clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ clean-local clean-noinstLIBRARIES mostlyclean-am distclean: distclean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/check_apt.Po + -rm -f ./$(DEPDIR)/check_by_ssh.Po + -rm -f ./$(DEPDIR)/check_cluster.Po + -rm -f ./$(DEPDIR)/check_curl-check_curl.Po + -rm -f ./$(DEPDIR)/check_dbi.Po + -rm -f ./$(DEPDIR)/check_dig.Po + -rm -f ./$(DEPDIR)/check_disk.Po + -rm -f ./$(DEPDIR)/check_dns.Po + -rm -f ./$(DEPDIR)/check_dummy.Po + -rm -f ./$(DEPDIR)/check_fping.Po + -rm -f ./$(DEPDIR)/check_game.Po + -rm -f ./$(DEPDIR)/check_hpjd.Po + -rm -f ./$(DEPDIR)/check_http.Po + -rm -f ./$(DEPDIR)/check_ide_smart.Po + -rm -f ./$(DEPDIR)/check_ldap.Po + -rm -f ./$(DEPDIR)/check_load.Po + -rm -f ./$(DEPDIR)/check_mrtg.Po + -rm -f ./$(DEPDIR)/check_mrtgtraf.Po + -rm -f ./$(DEPDIR)/check_mysql-check_mysql.Po + -rm -f ./$(DEPDIR)/check_mysql_query-check_mysql_query.Po + -rm -f ./$(DEPDIR)/check_nagios.Po + -rm -f ./$(DEPDIR)/check_nt.Po + -rm -f ./$(DEPDIR)/check_ntp.Po + -rm -f ./$(DEPDIR)/check_ntp_peer.Po + -rm -f ./$(DEPDIR)/check_ntp_time.Po + -rm -f ./$(DEPDIR)/check_nwstat.Po + -rm -f ./$(DEPDIR)/check_overcr.Po + -rm -f ./$(DEPDIR)/check_pgsql.Po + -rm -f ./$(DEPDIR)/check_ping.Po + -rm -f ./$(DEPDIR)/check_procs.Po + -rm -f ./$(DEPDIR)/check_radius.Po + -rm -f ./$(DEPDIR)/check_real.Po + -rm -f ./$(DEPDIR)/check_smtp.Po + -rm -f ./$(DEPDIR)/check_snmp.Po + -rm -f ./$(DEPDIR)/check_ssh.Po + -rm -f ./$(DEPDIR)/check_swap.Po + -rm -f ./$(DEPDIR)/check_tcp.Po + -rm -f ./$(DEPDIR)/check_time.Po + -rm -f ./$(DEPDIR)/check_ups.Po + -rm -f ./$(DEPDIR)/check_users.Po + -rm -f ./$(DEPDIR)/negate.Po + -rm -f ./$(DEPDIR)/netutils.Po + -rm -f ./$(DEPDIR)/popen.Po + -rm -f ./$(DEPDIR)/runcmd.Po + -rm -f ./$(DEPDIR)/sslutils.Po + -rm -f ./$(DEPDIR)/urlize.Po + -rm -f ./$(DEPDIR)/utils.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -2359,7 +2808,53 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/check_apt.Po + -rm -f ./$(DEPDIR)/check_by_ssh.Po + -rm -f ./$(DEPDIR)/check_cluster.Po + -rm -f ./$(DEPDIR)/check_curl-check_curl.Po + -rm -f ./$(DEPDIR)/check_dbi.Po + -rm -f ./$(DEPDIR)/check_dig.Po + -rm -f ./$(DEPDIR)/check_disk.Po + -rm -f ./$(DEPDIR)/check_dns.Po + -rm -f ./$(DEPDIR)/check_dummy.Po + -rm -f ./$(DEPDIR)/check_fping.Po + -rm -f ./$(DEPDIR)/check_game.Po + -rm -f ./$(DEPDIR)/check_hpjd.Po + -rm -f ./$(DEPDIR)/check_http.Po + -rm -f ./$(DEPDIR)/check_ide_smart.Po + -rm -f ./$(DEPDIR)/check_ldap.Po + -rm -f ./$(DEPDIR)/check_load.Po + -rm -f ./$(DEPDIR)/check_mrtg.Po + -rm -f ./$(DEPDIR)/check_mrtgtraf.Po + -rm -f ./$(DEPDIR)/check_mysql-check_mysql.Po + -rm -f ./$(DEPDIR)/check_mysql_query-check_mysql_query.Po + -rm -f ./$(DEPDIR)/check_nagios.Po + -rm -f ./$(DEPDIR)/check_nt.Po + -rm -f ./$(DEPDIR)/check_ntp.Po + -rm -f ./$(DEPDIR)/check_ntp_peer.Po + -rm -f ./$(DEPDIR)/check_ntp_time.Po + -rm -f ./$(DEPDIR)/check_nwstat.Po + -rm -f ./$(DEPDIR)/check_overcr.Po + -rm -f ./$(DEPDIR)/check_pgsql.Po + -rm -f ./$(DEPDIR)/check_ping.Po + -rm -f ./$(DEPDIR)/check_procs.Po + -rm -f ./$(DEPDIR)/check_radius.Po + -rm -f ./$(DEPDIR)/check_real.Po + -rm -f ./$(DEPDIR)/check_smtp.Po + -rm -f ./$(DEPDIR)/check_snmp.Po + -rm -f ./$(DEPDIR)/check_ssh.Po + -rm -f ./$(DEPDIR)/check_swap.Po + -rm -f ./$(DEPDIR)/check_tcp.Po + -rm -f ./$(DEPDIR)/check_time.Po + -rm -f ./$(DEPDIR)/check_ups.Po + -rm -f ./$(DEPDIR)/check_users.Po + -rm -f ./$(DEPDIR)/negate.Po + -rm -f ./$(DEPDIR)/netutils.Po + -rm -f ./$(DEPDIR)/popen.Po + -rm -f ./$(DEPDIR)/runcmd.Po + -rm -f ./$(DEPDIR)/sslutils.Po + -rm -f ./$(DEPDIR)/urlize.Po + -rm -f ./$(DEPDIR)/utils.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2378,14 +2873,13 @@ ps-am: uninstall-am: uninstall-libexecPROGRAMS uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \ - ctags-recursive install-am install-exec-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) check-am install-am install-exec-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-TESTS check-am clean \ - clean-generic clean-libexecPROGRAMS clean-libtool clean-local \ - clean-noinstLIBRARIES ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + am--depfiles check check-TESTS check-am clean clean-generic \ + clean-libexecPROGRAMS clean-libtool clean-local \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-data install-data-am install-dvi \ @@ -2396,9 +2890,11 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-local installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ + recheck tags tags-am uninstall uninstall-am \ uninstall-libexecPROGRAMS uninstall-local +.PRECIOUS: Makefile + @RELEASE_PRESENT_FALSE@NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @RELEASE_PRESENT_FALSE@ @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN @RELEASE_PRESENT_FALSE@.FORCE-NP-VERSION-FILE: diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index 13d8bc3..1ad547e 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -49,6 +49,8 @@ unsigned int commands = 0; unsigned int services = 0; int skip_stdout = 0; int skip_stderr = 0; +int warn_on_stderr = 0; +bool unknown_timeout = FALSE; char *remotecmd = NULL; char **commargv = NULL; int commargc = 0; @@ -100,6 +102,13 @@ main (int argc, char **argv) result = cmd_run_array (commargv, &chld_out, &chld_err, 0); + /* SSH returns 255 if connection attempt fails; include the first line of error output */ + if (result == 255 && unknown_timeout) { + printf (_("SSH connection failed: %s\n"), + chld_err.lines > 0 ? chld_err.line[0] : "(no error output)"); + return STATE_UNKNOWN; + } + if (verbose) { for(i = 0; i < chld_out.lines; i++) printf("stdout: %s\n", chld_out.line[i]); @@ -116,7 +125,10 @@ main (int argc, char **argv) if(chld_err.lines > skip_stderr) { printf (_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]); - return max_state_alt(result, STATE_UNKNOWN); + if ( warn_on_stderr ) + return max_state_alt(result, STATE_WARNING); + else + return max_state_alt(result, STATE_UNKNOWN); } /* this is simple if we're not supposed to be passive. @@ -176,6 +188,7 @@ process_arguments (int argc, char **argv) {"verbose", no_argument, 0, 'v'}, {"fork", no_argument, 0, 'f'}, {"timeout", required_argument, 0, 't'}, + {"unknown-timeout", no_argument, 0, 'U'}, {"host", required_argument, 0, 'H'}, /* backward compatibility */ {"hostname", required_argument, 0, 'H'}, {"port", required_argument,0,'p'}, @@ -189,6 +202,7 @@ process_arguments (int argc, char **argv) {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */ {"skip-stdout", optional_argument, 0, 'S'}, {"skip-stderr", optional_argument, 0, 'E'}, + {"warn-on-stderr", no_argument, 0, 'W'}, {"proto1", no_argument, 0, '1'}, {"proto2", no_argument, 0, '2'}, {"use-ipv4", no_argument, 0, '4'}, @@ -207,7 +221,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "Vvh1246fqt:H:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, + c = getopt_long (argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option); if (c == -1 || c == EOF) @@ -229,8 +243,10 @@ process_arguments (int argc, char **argv) else timeout_interval = atoi (optarg); break; + case 'U': + unknown_timeout = TRUE; + break; case 'H': /* host */ - host_or_die(optarg); hostname = optarg; break; case 'p': /* port number */ @@ -308,6 +324,9 @@ process_arguments (int argc, char **argv) else skip_stderr = atoi (optarg); break; + case 'W': /* exit with warning if there is an output on stderr */ + warn_on_stderr = 1; + break; case 'o': /* Extra options for the ssh command */ comm_append("-o"); comm_append(optarg); @@ -329,7 +348,6 @@ process_arguments (int argc, char **argv) if (c <= argc) { die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname); } - host_or_die(argv[c]); hostname = argv[c++]; } @@ -415,6 +433,8 @@ print_help (void) printf (" %s\n", _("Ignore all or (if specified) first n lines on STDOUT [optional]")); printf (" %s\n", "-E, --skip-stderr[=n]"); printf (" %s\n", _("Ignore all or (if specified) first n lines on STDERR [optional]")); + printf (" %s\n", "-W, --warn-on-stderr]"); + printf (" %s\n", _("Exit with an warning, if there is an output on STDERR")); printf (" %s\n", "-f"); printf (" %s\n", _("tells ssh to fork rather than create a tty [optional]. This will always return OK if ssh is executed")); printf (" %s\n","-C, --command='COMMAND STRING'"); @@ -437,6 +457,8 @@ print_help (void) printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); printf (UT_WARN_CRIT); printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (" %s\n","-U, --unknown-timeout"); + printf (" %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL")); printf (UT_VERBOSE); printf("\n"); printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); @@ -466,8 +488,8 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf (" %s -H -C [-fqv] [-1|-2] [-4|-6]\n" - " [-S [lines]] [-E [lines]] [-t timeout] [-i identity]\n" + printf (" %s -H -C [-fqvU] [-1|-2] [-4|-6]\n" + " [-S [lines]] [-E [lines]] [-W] [-t timeout] [-i identity]\n" " [-l user] [-n name] [-s servicelist] [-O outputfile]\n" " [-p port] [-o ssh-option] [-F configfile]\n", progname); diff --git a/plugins/check_curl.c b/plugins/check_curl.c index 99833f6..a69854a 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c @@ -55,18 +55,24 @@ const char *email = "devel@monitoring-plugins.org"; #include +#if defined(HAVE_SSL) && defined(USE_OPENSSL) +#include +#endif + +#include + #define MAKE_LIBCURL_VERSION(major, minor, patch) ((major)*0x10000 + (minor)*0x100 + (patch)) #define DEFAULT_BUFFER_SIZE 2048 #define DEFAULT_SERVER_URL "/" #define HTTP_EXPECT "HTTP/" -#define DEFAULT_MAX_REDIRS 15 #define INET_ADDR_MAX_SIZE INET6_ADDRSTRLEN enum { MAX_IPV4_HOSTLENGTH = 255, HTTP_PORT = 80, HTTPS_PORT = 443, - MAX_PORT = 65535 + MAX_PORT = 65535, + DEFAULT_MAX_REDIRS = 15 }; enum { @@ -187,6 +193,7 @@ int followsticky = STICKY_NONE; int use_ssl = FALSE; int use_sni = TRUE; int check_cert = FALSE; +int continue_after_check_cert = FALSE; typedef union { struct curl_slist* to_info; struct curl_certinfo* to_certinfo; @@ -206,6 +213,7 @@ int maximum_age = -1; int address_family = AF_UNSPEC; curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN; int curl_http_version = CURL_HTTP_VERSION_NONE; +int automatic_decompression = FALSE; int process_arguments (int, char**); void handle_curl_option_return_code (CURLcode res, const char* option); @@ -285,6 +293,20 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) * TODO: is the last certificate always the server certificate? */ cert = X509_STORE_CTX_get_current_cert(x509_ctx); +#if OPENSSL_VERSION_NUMBER >= 0x10100000L + X509_up_ref(cert); +#endif + if (verbose>=2) { + puts("* SSL verify callback with certificate:"); + X509_NAME *subject, *issuer; + printf("* issuer:\n"); + issuer = X509_get_issuer_name( cert ); + X509_NAME_print_ex_fp(stdout, issuer, 5, XN_FLAG_MULTILINE); + printf("* curl verify_callback:\n* subject:\n"); + subject = X509_get_subject_name( cert ); + X509_NAME_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE); + puts(""); + } return 1; } @@ -350,6 +372,46 @@ handle_curl_option_return_code (CURLcode res, const char* option) } } +int +lookup_host (const char *host, char *buf, size_t buflen) +{ + struct addrinfo hints, *res, *result; + int errcode; + void *ptr; + + memset (&hints, 0, sizeof (hints)); + hints.ai_family = address_family; + hints.ai_socktype = SOCK_STREAM; + hints.ai_flags |= AI_CANONNAME; + + errcode = getaddrinfo (host, NULL, &hints, &result); + if (errcode != 0) + return errcode; + + res = result; + + while (res) { + inet_ntop (res->ai_family, res->ai_addr->sa_data, buf, buflen); + switch (res->ai_family) { + case AF_INET: + ptr = &((struct sockaddr_in *) res->ai_addr)->sin_addr; + break; + case AF_INET6: + ptr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr; + break; + } + inet_ntop (res->ai_family, ptr, buf, buflen); + if (verbose >= 1) + printf ("* getaddrinfo IPv%d address: %s\n", + res->ai_family == PF_INET6 ? 6 : 4, buf); + res = res->ai_next; + } + + freeaddrinfo(result); + + return 0; +} + int check_http (void) { @@ -357,6 +419,9 @@ check_http (void) int page_len = 0; int i; char *force_host_header = NULL; + struct curl_slist *host = NULL; + char addrstr[100]; + char dnscache[DEFAULT_BUFFER_SIZE]; /* initialize curl */ if (curl_global_init (CURL_GLOBAL_DEFAULT) != CURLE_OK) @@ -371,6 +436,13 @@ check_http (void) /* print everything on stdout like check_http would do */ handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_STDERR, stdout), "CURLOPT_STDERR"); + if (automatic_decompression) +#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6) + handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""), "CURLOPT_ACCEPT_ENCODING"); +#else + handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_ENCODING, ""), "CURLOPT_ENCODING"); +#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6) */ + /* initialize buffer for body of the answer */ if (curlhelp_initwritebuffer(&body_buf) < 0) die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n"); @@ -392,9 +464,12 @@ check_http (void) // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we use the host_name later on to make SNI happy if(use_ssl && host_name != NULL) { - struct curl_slist *host = NULL; - char dnscache[DEFAULT_BUFFER_SIZE]; - snprintf (dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, server_address); + if ( (res=lookup_host (server_address, addrstr, 100)) != 0) { + snprintf (msg, DEFAULT_BUFFER_SIZE, _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %s"), + server_address, res, gai_strerror (res)); + die (STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg); + } + snprintf (dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, addrstr); host = curl_slist_append(NULL, dnscache); curl_easy_setopt(curl, CURLOPT_RESOLVE, host); if (verbose>=1) @@ -680,7 +755,9 @@ check_http (void) * and we actually have OpenSSL in the monitoring tools */ result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); - return result; + if (continue_after_check_cert == FALSE) { + return result; + } #else /* USE_OPENSSL */ die (STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n"); #endif /* USE_OPENSSL */ @@ -720,13 +797,17 @@ GOT_FIRST_CERT: } BIO_free (cert_BIO); result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit); - return result; + if (continue_after_check_cert == FALSE) { + return result; + } #else /* USE_OPENSSL */ /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal, * so we use the libcurl CURLINFO data */ result = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit); - return result; + if (continue_after_check_cert == FALSE) { + return result; + } #endif /* USE_OPENSSL */ } else { snprintf (msg, DEFAULT_BUFFER_SIZE, _("Cannot retrieve certificates - cURL returned %d - %s"), @@ -959,8 +1040,8 @@ char* uri_string (const UriTextRangeA range, char* buf, size_t buflen) { if (!range.first) return "(null)"; - strncpy (buf, range.first, max (buflen, range.afterLast - range.first)); - buf[max (buflen, range.afterLast - range.first)] = '\0'; + strncpy (buf, range.first, max (buflen-1, range.afterLast - range.first)); + buf[max (buflen-1, range.afterLast - range.first)] = '\0'; buf[range.afterLast - range.first] = '\0'; return buf; } @@ -980,7 +1061,7 @@ redir (curlhelp_write_curlbuf* header_buf) char *new_url; int res = phr_parse_response (header_buf->buf, header_buf->buflen, - &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, + &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0); location = get_header_value (headers, nof_headers, "location"); @@ -1080,8 +1161,8 @@ redir (curlhelp_write_curlbuf* header_buf) !strncmp(server_address, new_host, MAX_IPV4_HOSTLENGTH) && (host_name && !strncmp(host_name, new_host, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, new_url)) - die (STATE_WARNING, - _("HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), + die (STATE_CRITICAL, + _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), use_ssl ? "https" : "http", new_host, new_port, new_url, (display_html ? "" : "")); /* set new values for redirected request */ @@ -1136,8 +1217,11 @@ process_arguments (int argc, char **argv) enum { INVERT_REGEX = CHAR_MAX + 1, SNI_OPTION, + MAX_REDIRS_OPTION, + CONTINUE_AFTER_CHECK_CERT, CA_CERT_OPTION, - HTTP_VERSION_OPTION + HTTP_VERSION_OPTION, + AUTOMATIC_DECOMPRESSION }; int option = 0; @@ -1168,6 +1252,7 @@ process_arguments (int argc, char **argv) {"private-key", required_argument, 0, 'K'}, {"ca-cert", required_argument, 0, CA_CERT_OPTION}, {"verify-cert", no_argument, 0, 'D'}, + {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT}, {"useragent", required_argument, 0, 'A'}, {"header", required_argument, 0, 'k'}, {"no-body", no_argument, 0, 'N'}, @@ -1179,7 +1264,9 @@ process_arguments (int argc, char **argv) {"use-ipv6", no_argument, 0, '6'}, {"extended-perfdata", no_argument, 0, 'E'}, {"show-body", no_argument, 0, 'B'}, + {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION}, {"http-version", required_argument, 0, HTTP_VERSION_OPTION}, + {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION}, {0, 0, 0, 0} }; @@ -1324,6 +1411,11 @@ process_arguments (int argc, char **argv) } check_cert = TRUE; goto enable_ssl; +#endif + case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */ +#ifdef HAVE_SSL + continue_after_check_cert = TRUE; + break; #endif case 'J': /* use client certificate */ #ifdef LIBCURL_FEATURE_SSL @@ -1346,7 +1438,7 @@ process_arguments (int argc, char **argv) #ifdef LIBCURL_FEATURE_SSL case 'D': /* verify peer certificate & host */ verify_peer_and_host = TRUE; - goto enable_ssl; + break; #endif case 'S': /* use SSL */ #ifdef LIBCURL_FEATURE_SSL @@ -1436,6 +1528,13 @@ process_arguments (int argc, char **argv) use_sni = TRUE; break; #endif /* LIBCURL_FEATURE_SSL */ + case MAX_REDIRS_OPTION: + if (!is_intnonneg (optarg)) + usage2 (_("Invalid max_redirs count"), optarg); + else { + max_depth = atoi (optarg); + } + break; case 'f': /* onredirect */ if (!strcmp (optarg, "ok")) onredirect = STATE_OK; @@ -1571,6 +1670,9 @@ process_arguments (int argc, char **argv) exit (STATE_WARNING); } break; + case AUTOMATIC_DECOMPRESSION: + automatic_decompression = TRUE; + break; case '?': /* print short usage statement if args not parsable */ usage5 (); @@ -1712,7 +1814,11 @@ print_help (void) #endif printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]"); printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443")); - printf (" %s\n", _("(when this option is used the URL is not checked.)")); + printf (" %s\n", _("(when this option is used the URL is not checked by default. You can use")); + printf (" %s\n", _(" --continue-after-certificate to override this behavior)")); + printf (" %s\n", "--continue-after-certificate"); + printf (" %s\n", _("Allows the HTTP check to continue after performing the certificate check.")); + printf (" %s\n", _("Does nothing unless -C is used.")); printf (" %s\n", "-J, --client-cert=FILE"); printf (" %s\n", _("Name of file that contains the client certificate (PEM format)")); printf (" %s\n", _("to be used in establishing the SSL session")); @@ -1775,12 +1881,17 @@ print_help (void) printf (" %s\n", _("specified IP address. stickyport also ensures port stays the same.")); printf (" %s\n", _("follow uses the old redirection algorithm of check_http.")); printf (" %s\n", _("curl uses CURL_FOLLOWLOCATION built into libcurl.")); + printf (" %s\n", "--max-redirs=INTEGER"); + printf (" %s", _("Maximal number of redirects (default: ")); + printf ("%d)\n", DEFAULT_MAX_REDIRS); printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>"); printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)")); printf ("\n"); printf (" %s\n", "--http-version=VERSION"); printf (" %s\n", _("Connect via specific HTTP protocol.")); printf (" %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)")); + printf (" %s\n", "--enable-automatic-decompression"); + printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING).")); printf ("\n"); printf (UT_WARN_CRIT); @@ -1995,7 +2106,7 @@ curlhelp_parse_statusline (const char *buf, curlhelp_statusline *status_line) char *first_line_buf; /* find last start of a new header */ - start = strrstr2 (buf, "\r\nHTTP"); + start = strrstr2 (buf, "\r\nHTTP/"); if (start != NULL) { start += 2; buf = start; @@ -2107,7 +2218,7 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA size_t msglen; int res = phr_parse_response (header_buf->buf, header_buf->buflen, - &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, + &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0); server_date = get_header_value (headers, nof_headers, "date"); @@ -2165,7 +2276,7 @@ get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_wri curlhelp_statusline status_line; int res = phr_parse_response (header_buf->buf, header_buf->buflen, - &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, + &status_line.http_major, &status_line.http_minor, &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0); content_length_s = get_header_value (headers, nof_headers, "content-length"); diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 844e625..7018c6f 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -1,29 +1,29 @@ /***************************************************************************** -* +* * Monitoring check_disk plugin -* +* * License: GPL * Copyright (c) 1999-2008 Monitoring Plugins Development Team -* +* * Description: -* +* * This file contains the check_disk plugin -* -* +* +* * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program. If not, see . -* -* +* +* *****************************************************************************/ const char *progname = "check_disk"; @@ -46,7 +46,7 @@ const char *email = "devel@monitoring-plugins.org"; #include #include "fsusage.h" #include "mountlist.h" -#include "intprops.h" /* necessary for TYPE_MAXIMUM */ +#include "intprops.h" /* necessary for TYPE_MAXIMUM */ #if HAVE_LIMITS_H # include #endif @@ -171,9 +171,6 @@ main (int argc, char **argv) char *perf_ilabel; char *preamble; char *flag_header; - double inode_space_pct; - double warning_high_tide; - double critical_high_tide; int temp_result; struct mount_entry *me; @@ -232,8 +229,10 @@ main (int argc, char **argv) /* Process for every path in list */ for (path = path_select_list; path; path=path->name_next) { if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL) - printf("Thresholds(pct) for %s warn: %f crit %f\n",path->name, path->freespace_percent->warning->end, - path->freespace_percent->critical->end); + printf("Thresholds(pct) for %s warn: %f crit %f\n", + path->name, + path->freespace_percent->warning->end, + path->freespace_percent->critical->end); if (verbose >= 3 && path->group != NULL) printf("Group of %s: %s\n",path->name,path->group); @@ -245,17 +244,17 @@ main (int argc, char **argv) #ifdef __CYGWIN__ if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11) - continue; + continue; snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10); if (GetDriveType(mountdir) != DRIVE_FIXED) - me->me_remote = 1; + me->me_remote = 1; #endif /* Filters */ /* Remove filesystems already seen */ if (np_seen_name(seen, me->me_mountdir)) { continue; - } + } np_add_name(&seen, me->me_mountdir); if (path->group == NULL) { @@ -288,8 +287,17 @@ main (int argc, char **argv) get_stats (path, &fsp); if (verbose >= 3) { - printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n", - me->me_mountdir, path->dused_pct, path->dfree_pct, path->dused_units, path->dfree_units, path->dtotal_units, path->dused_inodes_percent, path->dfree_inodes_percent, fsp.fsu_blocksize, mult); + printf ("For %s, used_pct=%g free_pct=%g used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%lu mult=%lu\n", + me->me_mountdir, + path->dused_pct, + path->dfree_pct, + path->dused_units, + path->dfree_units, + path->dtotal_units, + path->dused_inodes_percent, + path->dfree_inodes_percent, + fsp.fsu_blocksize, + mult); } /* Threshold comparisons */ @@ -326,84 +334,78 @@ main (int argc, char **argv) */ /* *_high_tide must be reinitialized at each run */ - warning_high_tide = UINT_MAX; - critical_high_tide = UINT_MAX; + uint64_t warning_high_tide = UINT64_MAX; if (path->freespace_units->warning != NULL) { - warning_high_tide = path->dtotal_units - path->freespace_units->warning->end; + warning_high_tide = (path->dtotal_units - path->freespace_units->warning->end) * mult; } if (path->freespace_percent->warning != NULL) { - warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*path->dtotal_units )); - } - if (path->freespace_units->critical != NULL) { - critical_high_tide = path->dtotal_units - path->freespace_units->critical->end; - } - if (path->freespace_percent->critical != NULL) { - critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*path->dtotal_units )); + warning_high_tide = min( warning_high_tide, (uint64_t)((1.0 - path->freespace_percent->warning->end/100) * (path->dtotal_units * mult)) ); } - /* Nb: *_high_tide are unset when == UINT_MAX */ + uint64_t critical_high_tide = UINT64_MAX; + + if (path->freespace_units->critical != NULL) { + critical_high_tide = (path->dtotal_units - path->freespace_units->critical->end) * mult; + } + if (path->freespace_percent->critical != NULL) { + critical_high_tide = min( critical_high_tide, (uint64_t)((1.0 - path->freespace_percent->critical->end/100) * (path->dtotal_units * mult)) ); + } + + /* Nb: *_high_tide are unset when == UINT64_MAX */ xasprintf (&perf, "%s %s", perf, - perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, - path->dused_units, units, - (warning_high_tide != UINT_MAX ? TRUE : FALSE), warning_high_tide, - (critical_high_tide != UINT_MAX ? TRUE : FALSE), critical_high_tide, - TRUE, 0, - TRUE, path->dtotal_units)); + perfdata_uint64 ( + (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, + path->dused_units * mult, "B", + (warning_high_tide == UINT64_MAX ? FALSE : TRUE), warning_high_tide, + (critical_high_tide == UINT64_MAX ? FALSE : TRUE), critical_high_tide, + TRUE, 0, + TRUE, path->dtotal_units * mult)); if (display_inodes_perfdata) { /* *_high_tide must be reinitialized at each run */ - warning_high_tide = UINT_MAX; - critical_high_tide = UINT_MAX; + warning_high_tide = UINT64_MAX; + critical_high_tide = UINT64_MAX; if (path->freeinodes_percent->warning != NULL) { - warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freeinodes_percent->warning->end/100)*path->inodes_total )); + warning_high_tide = (uint64_t) fabs( min( (double) warning_high_tide, (double) (1.0 - path->freeinodes_percent->warning->end/100)*path->inodes_total )); } if (path->freeinodes_percent->critical != NULL) { - critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freeinodes_percent->critical->end/100)*path->inodes_total )); + critical_high_tide = (uint64_t) fabs( min( (double) critical_high_tide, (double) (1.0 - path->freeinodes_percent->critical->end/100)*path->inodes_total )); } xasprintf (&perf_ilabel, "%s (inodes)", (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir); - /* Nb: *_high_tide are unset when == UINT_MAX */ + /* Nb: *_high_tide are unset when == UINT64_MAX */ xasprintf (&perf, "%s %s", perf, - perfdata (perf_ilabel, - path->inodes_used, "", - (warning_high_tide != UINT_MAX ? TRUE : FALSE), warning_high_tide, - (critical_high_tide != UINT_MAX ? TRUE : FALSE), critical_high_tide, - TRUE, 0, - TRUE, path->inodes_total)); + perfdata_uint64 (perf_ilabel, + path->inodes_used, "", + (warning_high_tide != UINT64_MAX ? TRUE : FALSE), warning_high_tide, + (critical_high_tide != UINT64_MAX ? TRUE : FALSE), critical_high_tide, + TRUE, 0, + TRUE, path->inodes_total)); } if (disk_result==STATE_OK && erronly && !verbose) continue; - if(disk_result && verbose >= 1) { - xasprintf(&flag_header, " %s [", state_text (disk_result)); - } else { - xasprintf(&flag_header, ""); - } - xasprintf (&output, "%s%s %s %.0f %s (%.0f%%", - output, flag_header, - (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, - path->dfree_units, - units, - path->dfree_pct); - if (path->dused_inodes_percent < 0) { - xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : "")); - } else { - xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : "")); - } + if(disk_result && verbose >= 1) { + xasprintf(&flag_header, " %s [", state_text (disk_result)); + } else { + xasprintf(&flag_header, ""); + } + xasprintf (&output, "%s%s %s %llu%s (%.0f%%", + output, flag_header, + (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, + path->dfree_units, + units, + path->dfree_pct); + if (path->dused_inodes_percent < 0) { + xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : "")); + } else { + xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : "")); + } free(flag_header); - /* TODO: Need to do a similar debug line - xasprintf (&details, _("%s\n\ -%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"), - details, dfree_units, dtotal_units, units, dfree_pct, inode_space_pct, - me->me_devname, me->me_type, me->me_mountdir, - (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp); - */ - } - } if (verbose >= 2) @@ -557,14 +559,14 @@ process_arguments (int argc, char **argv) } break; - case 'W': /* warning inode threshold */ + case 'W': /* warning inode threshold */ if (*optarg == '@') { warn_freeinodes_percent = optarg; } else { xasprintf(&warn_freeinodes_percent, "@%s", optarg); } break; - case 'K': /* critical inode threshold */ + case 'K': /* critical inode threshold */ if (*optarg == '@') { crit_freeinodes_percent = optarg; } else { @@ -574,21 +576,24 @@ process_arguments (int argc, char **argv) case 'u': if (units) free(units); - if (! strcmp (optarg, "bytes")) { + if (! strcasecmp (optarg, "bytes")) { mult = (uintmax_t)1; units = strdup ("B"); - } else if (! strcmp (optarg, "kB")) { + } else if ( (! strcmp (optarg, "kB")) || (!strcmp(optarg, "KiB")) ) { mult = (uintmax_t)1024; - units = strdup ("kB"); - } else if (! strcmp (optarg, "MB")) { + units = strdup ("kiB"); + } else if ( (! strcmp (optarg, "MB")) || (!strcmp(optarg, "MiB")) ) { mult = (uintmax_t)1024 * 1024; - units = strdup ("MB"); - } else if (! strcmp (optarg, "GB")) { + units = strdup ("MiB"); + } else if ( (! strcmp (optarg, "GB")) || (!strcmp(optarg, "GiB")) ) { mult = (uintmax_t)1024 * 1024 * 1024; - units = strdup ("GB"); - } else if (! strcmp (optarg, "TB")) { + units = strdup ("GiB"); + } else if ( (! strcmp (optarg, "TB")) || (!strcmp(optarg, "TiB")) ) { mult = (uintmax_t)1024 * 1024 * 1024 * 1024; - units = strdup ("TB"); + units = strdup ("TiB"); + } else if ( (! strcmp (optarg, "PB")) || (!strcmp(optarg, "PiB")) ) { + mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024; + units = strdup ("PiB"); } else { die (STATE_UNKNOWN, _("unit type %s not known\n"), optarg); } @@ -599,13 +604,13 @@ process_arguments (int argc, char **argv) mult = 1024; if (units) free(units); - units = strdup ("kB"); + units = strdup ("kiB"); break; case 'm': /* display mountpoint */ mult = 1024 * 1024; if (units) free(units); - units = strdup ("MB"); + units = strdup ("MiB"); break; case 'L': stat_remote_fs = 1; @@ -675,6 +680,7 @@ process_arguments (int argc, char **argv) break; case 'I': cflags |= REG_ICASE; + // Intentional fallthrough case 'i': if (!path_selected) die (STATE_UNKNOWN, "DISK %s: %s\n", _("UNKNOWN"), _("Paths need to be selected before using -i/-I. Use -A to select all paths explicitly")); @@ -714,8 +720,10 @@ process_arguments (int argc, char **argv) case 'A': optarg = strdup(".*"); + // Intentional fallthrough case 'R': cflags |= REG_ICASE; + // Intentional fallthrough case 'r': if (! (warn_freespace_units || crit_freespace_units || warn_freespace_percent || crit_freespace_percent || warn_usedspace_units || crit_usedspace_units || @@ -812,7 +820,7 @@ process_arguments (int argc, char **argv) } if (units == NULL) { - units = strdup ("MB"); + units = strdup ("MiB"); mult = (uintmax_t)1024 * 1024; } @@ -848,51 +856,6 @@ set_all_thresholds (struct parameter_list *path) set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent); } -/* TODO: Remove? - -int -validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath) -{ - if (w < 0 && c < 0 && wp < 0.0 && cp < 0.0) { - printf (_("INPUT ERROR: No thresholds specified")); - print_path (mypath); - return ERROR; - } - else if ((wp >= 0.0 || cp >= 0.0) && - (wp < 0.0 || cp < 0.0 || wp > 100.0 || cp > 100.0 || cp > wp)) { - printf (_("\ -INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive"), - cp, wp); - print_path (mypath); - return ERROR; - } - else if ((iwp >= 0.0 || icp >= 0.0) && - (iwp < 0.0 || icp < 0.0 || iwp > 100.0 || icp > 100.0 || icp > iwp)) { - printf (_("\ -INPUT ERROR: C_IDFP (%f) should be less than W_IDFP (%.1f) and both should be between zero and 100 percent, inclusive"), - icp, iwp); - print_path (mypath); - return ERROR; - } - else if ((w > 0 || c > 0) && (w == 0 || c == 0 || c > w)) { - printf (_("\ -INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greater than zero"), - (unsigned long)c, (unsigned long)w); - print_path (mypath); - return ERROR; - } - - return OK; -} - -*/ - - - - - - - void print_help (void) { @@ -947,7 +910,7 @@ print_help (void) printf (" %s\n", _("Only check local filesystems against thresholds. Yet call stat on remote filesystems")); printf (" %s\n", _("to test if they are accessible (e.g. to detect Stale NFS Handles)")); printf (" %s\n", "-M, --mountpoint"); - printf (" %s\n", _("Display the mountpoint instead of the partition")); + printf (" %s\n", _("Display the (block) device instead of the mount point")); printf (" %s\n", "-m, --megabytes"); printf (" %s\n", _("Same as '--units MB'")); printf (" %s\n", "-A, --all"); @@ -1026,20 +989,26 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { if (p_list->group && ! (strcmp(p_list->group, p->group))) { stat_path(p_list); get_fs_usage (p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp); - get_path_stats(p_list, &tmpfsp); + get_path_stats(p_list, &tmpfsp); if (verbose >= 3) - printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n", - p_list->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units, p_list->dfree_units, - p_list->dtotal_units, mult); + printf("Group %s: adding %lu blocks sized %lu, (%s) used_units=%lu free_units=%lu total_units=%lu mult=%lu\n", + p_list->group, + tmpfsp.fsu_blocks, + tmpfsp.fsu_blocksize, + p_list->best_match->me_mountdir, + p_list->dused_units, + p_list->dfree_units, + p_list->dtotal_units, + mult); - /* prevent counting the first FS of a group twice since its parameter_list entry + /* prevent counting the first FS of a group twice since its parameter_list entry * is used to carry the information of all file systems of the entire group */ if (! first) { p->total += p_list->total; p->available += p_list->available; p->available_to_root += p_list->available_to_root; p->used += p_list->used; - + p->dused_units += p_list->dused_units; p->dfree_units += p_list->dfree_units; p->dtotal_units += p_list->dtotal_units; @@ -1050,28 +1019,29 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) { } first = 0; } - if (verbose >= 3) - printf("Group %s now has: used_units=%g free_units=%g total_units=%g fsu_blocksize=%llu mult=%llu\n", - p->group, tmpfsp.fsu_bavail, tmpfsp.fsu_blocksize, p->best_match->me_mountdir, p->dused_units, - p->dfree_units, p->dtotal_units, mult); + if (verbose >= 3) + printf("Group %s now has: used_units=%lu free_units=%lu total_units=%lu fsu_blocksize=%lu mult=%lu\n", + p->group, + p->dused_units, + p->dfree_units, + p->dtotal_units, + tmpfsp.fsu_blocksize, + mult); } /* modify devname and mountdir for output */ p->best_match->me_mountdir = p->best_match->me_devname = p->group; } /* finally calculate percentages for either plain FS or summed up group */ - p->dused_pct = calculate_percent( p->used, p->used + p->available ); /* used + available can never be > uintmax */ + p->dused_pct = calculate_percent( p->used, p->used + p->available ); /* used + available can never be > uintmax */ p->dfree_pct = 100 - p->dused_pct; p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total); p->dfree_inodes_percent = 100 - p->dused_inodes_percent; - + } void get_path_stats (struct parameter_list *p, struct fs_usage *fsp) { - /* 2007-12-08 - Workaround for Gnulib reporting insanely high available - * space on BSD (the actual value should be negative but fsp->fsu_bavail - * is unsigned) */ - p->available = fsp->fsu_bavail > fsp->fsu_bfree ? 0 : fsp->fsu_bavail; + p->available = fsp->fsu_bavail; p->available_to_root = fsp->fsu_bfree; p->used = fsp->fsu_blocks - fsp->fsu_bfree; if (freespace_ignore_reserved) { @@ -1081,7 +1051,7 @@ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) { /* default behaviour : take all the blocks into account */ p->total = fsp->fsu_blocks; } - + p->dused_units = p->used*fsp->fsu_blocksize/mult; p->dfree_units = p->available*fsp->fsu_blocksize/mult; p->dtotal_units = p->total*fsp->fsu_blocksize/mult; diff --git a/plugins/check_dns.c b/plugins/check_dns.c index 0f2e654..9de6caf 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -41,7 +41,7 @@ const char *email = "devel@monitoring-plugins.org"; int process_arguments (int, char **); int validate_arguments (void); -int error_scan (char *); +int error_scan (char *, int *); int ip_match_cidr(const char *, const char *); unsigned long ip2long(const char *); void print_help (void); @@ -54,6 +54,7 @@ char ptr_server[ADDRESS_LENGTH] = ""; int verbose = FALSE; char **expected_address = NULL; int expected_address_cnt = 0; +int expect_nxdomain = FALSE; int expect_authority = FALSE; int all_match = FALSE; @@ -87,6 +88,7 @@ main (int argc, char **argv) int parse_address = FALSE; /* This flag scans for Address: but only after Name: */ output chld_out, chld_err; size_t i; + int is_nxdomain = FALSE; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -186,7 +188,7 @@ main (int argc, char **argv) } - result = error_scan (chld_out.line[i]); + result = error_scan (chld_out.line[i], &is_nxdomain); if (result != STATE_OK) { msg = strchr (chld_out.line[i], ':'); if(msg) msg++; @@ -199,8 +201,8 @@ main (int argc, char **argv) if (verbose) puts(chld_err.line[i]); - if (error_scan (chld_err.line[i]) != STATE_OK) { - result = max_state (result, error_scan (chld_err.line[i])); + if (error_scan (chld_err.line[i], &is_nxdomain) != STATE_OK) { + result = max_state (result, error_scan (chld_err.line[i], &is_nxdomain)); msg = strchr(input_buffer, ':'); if(msg) msg++; @@ -209,6 +211,10 @@ main (int argc, char **argv) } } + if (is_nxdomain && !expect_nxdomain) { + die (STATE_CRITICAL, _("Domain '%s' was not found by the server\n"), query_address); + } + if (addresses) { int i,slen; char *adrp; @@ -260,6 +266,16 @@ main (int argc, char **argv) } } + if (expect_nxdomain) { + if (!is_nxdomain) { + result = STATE_CRITICAL; + xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), query_address, address); + } else { + if (address != NULL) free(address); + address = "NXDOMAIN"; + } + } + /* check if authoritative */ if (result == STATE_OK && expect_authority && non_authoritative) { result = STATE_CRITICAL; @@ -339,9 +355,15 @@ ip2long(const char* src) { } int -error_scan (char *input_buffer) +error_scan (char *input_buffer, int *is_nxdomain) { + const int nxdomain = strstr (input_buffer, "Non-existent") || + strstr (input_buffer, "** server can't find") || + strstr (input_buffer, "** Can't find") || + strstr (input_buffer, "NXDOMAIN"); + if (nxdomain) *is_nxdomain = TRUE; + /* the DNS lookup timed out */ if (strstr (input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) || strstr (input_buffer, _("Consider using the `dig' or `host' programs instead. Run nslookup with")) || @@ -360,7 +382,7 @@ error_scan (char *input_buffer) /* Connection was refused */ else if (strstr (input_buffer, "Connection refused") || - strstr (input_buffer, "Couldn't find server") || + strstr (input_buffer, "Couldn't find server") || strstr (input_buffer, "Refused") || (strstr (input_buffer, "** server can't find") && strstr (input_buffer, ": REFUSED"))) @@ -374,13 +396,6 @@ error_scan (char *input_buffer) else if (strstr (input_buffer, "No information")) die (STATE_CRITICAL, _("No information returned by DNS server at %s\n"), dns_server); - /* Host or domain name does not exist */ - else if (strstr (input_buffer, "Non-existent") || - strstr (input_buffer, "** server can't find") || - strstr (input_buffer, "** Can't find") || - strstr (input_buffer,"NXDOMAIN")) - die (STATE_CRITICAL, _("Domain %s was not found by the server\n"), query_address); - /* Network is unreachable */ else if (strstr (input_buffer, "Network is unreachable")) die (STATE_CRITICAL, _("Network is unreachable\n")); @@ -417,6 +432,7 @@ process_arguments (int argc, char **argv) {"server", required_argument, 0, 's'}, {"reverse-server", required_argument, 0, 'r'}, {"expected-address", required_argument, 0, 'a'}, + {"expect-nxdomain", no_argument, 0, 'n'}, {"expect-authority", no_argument, 0, 'A'}, {"all", no_argument, 0, 'L'}, {"warning", required_argument, 0, 'w'}, @@ -432,7 +448,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "hVvALt:H:s:r:a:w:c:", long_opts, &opt_index); + c = getopt_long (argc, argv, "hVvALnt:H:s:r:a:w:c:", long_opts, &opt_index); if (c == -1 || c == EOF) break; @@ -491,6 +507,9 @@ process_arguments (int argc, char **argv) expected_address_cnt++; } break; + case 'n': /* expect NXDOMAIN */ + expect_nxdomain = TRUE; + break; case 'A': /* expect authority */ expect_authority = TRUE; break; @@ -532,8 +551,15 @@ process_arguments (int argc, char **argv) int validate_arguments () { - if (query_address[0] == 0) + if (query_address[0] == 0) { + printf ("missing --host argument\n"); return ERROR; + } + + if (expected_address_cnt > 0 && expect_nxdomain) { + printf ("--expected-address and --expect-nxdomain cannot be combined\n"); + return ERROR; + } return OK; } @@ -566,6 +592,9 @@ print_help (void) printf (" %s\n", _("Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end")); printf (" %s\n", _("with a dot (.). This option can be repeated multiple times (Returns OK if any")); printf (" %s\n", _("value matches).")); + printf (" -n, --expect-nxdomain\n"); + printf (" %s\n", _("Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)")); + printf (" %s\n", _("Cannot be used together with -a")); printf (" -A, --expect-authority\n"); printf (" %s\n", _("Optionally expect the DNS server to be authoritative for the lookup")); printf (" -w, --warning=seconds\n"); @@ -586,5 +615,5 @@ void print_usage (void) { printf ("%s\n", _("Usage:")); - printf ("%s -H host [-s server] [-a expected-address] [-A] [-t timeout] [-w warn] [-c crit] [-L]\n", progname); + printf ("%s -H host [-s server] [-a expected-address] [-n] [-A] [-t timeout] [-w warn] [-c crit] [-L]\n", progname); } diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 521d0fe..be9362a 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c @@ -37,6 +37,7 @@ const char *email = "devel@monitoring-plugins.org"; #include "popen.h" #include "netutils.h" #include "utils.h" +#include enum { PACKET_COUNT = 1, @@ -65,6 +66,7 @@ double crta; double wrta; int cpl_p = FALSE; int wpl_p = FALSE; +bool alive_p = FALSE; int crta_p = FALSE; int wrta_p = FALSE; @@ -147,9 +149,11 @@ main (int argc, char **argv) (void) fclose (child_stderr); /* close the pipe */ - if (result = spclose (child_process)) + result = spclose (child_process); + if (result) { /* need to use max_state not max */ status = max_state (status, STATE_WARNING); + } if (result > 1 ) { status = max_state (status, STATE_UNKNOWN); @@ -171,10 +175,7 @@ main (int argc, char **argv) } - -int -textscan (char *buf) -{ +int textscan (char *buf) { char *rtastr = NULL; char *losstr = NULL; char *xmtstr = NULL; @@ -183,6 +184,20 @@ textscan (char *buf) double xmt; int status = STATE_UNKNOWN; + /* stops testing after the first successful reply. */ + if (alive_p && strstr(buf, "avg, 0% loss)")) { + rtastr = strstr (buf, "ms ("); + rtastr = 1 + index(rtastr, '('); + rta = strtod(rtastr, NULL); + loss=strtod("0",NULL); + die (STATE_OK, + _("FPING %s - %s (rta=%f ms)|%s\n"), + state_text (STATE_OK), server_name,rta, + /* No loss since we only waited for the first reply + perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, TRUE, 0, TRUE, 100), */ + fperfdata ("rta", rta/1.0e3, "s", wrta_p, wrta/1.0e3, crta_p, crta/1.0e3, TRUE, 0, FALSE, 0)); + } + if (strstr (buf, "not found")) { die (STATE_CRITICAL, _("FPING UNKNOWN - %s not found\n"), server_name); @@ -278,6 +293,7 @@ process_arguments (int argc, char **argv) {"sourceif", required_argument, 0, 'I'}, {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'}, + {"alive", no_argument, 0, 'a'}, {"bytes", required_argument, 0, 'b'}, {"number", required_argument, 0, 'n'}, {"target-timeout", required_argument, 0, 'T'}, @@ -304,7 +320,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "+hVvH:S:c:w:b:n:T:i:I:46", longopts, &option); + c = getopt_long (argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:46", longopts, &option); if (c == -1 || c == EOF || c == 1) break; @@ -312,6 +328,9 @@ process_arguments (int argc, char **argv) switch (c) { case '?': /* print short usage statement if args not parsable */ usage5 (); + case 'a': /* host alive mode */ + alive_p = TRUE; + break; case 'h': /* help */ print_help (); exit (STATE_UNKNOWN); @@ -446,9 +465,7 @@ get_threshold (char *arg, char *rv[2]) } -void -print_help (void) -{ +void print_help (void) { print_revision (progname, NP_VERSION); @@ -474,6 +491,8 @@ print_help (void) printf (" %s\n", _("warning threshold pair")); printf (" %s\n", "-c, --critical=THRESHOLD"); printf (" %s\n", _("critical threshold pair")); + printf (" %s\n", "-a, --alive"); + printf (" %s\n", _("Return OK after first successfull reply")); printf (" %s\n", "-b, --bytes=INTEGER"); printf (" %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE); printf (" %s\n", "-n, --number=INTEGER"); diff --git a/plugins/check_game.c b/plugins/check_game.c index 709dae1..a534b69 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -318,7 +318,7 @@ print_help (void) printf ("%s\n", _("Notes:")); printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool.")); printf (" %s\n", _("If you don't have the package installed, you will need to download it from")); - printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); + printf (" %s\n", _("https://github.com/multiplay/qstat before you can use this plugin.")); printf (UT_SUPPORT); } diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index 6546556..c4b4417 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c @@ -66,7 +66,7 @@ void print_usage (void); char *community = NULL; char *address = NULL; -char *port = NULL; +unsigned int port = 0; int check_paper_out = 1; int @@ -121,8 +121,12 @@ main (int argc, char **argv) HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY); /* get the command to run */ - sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%hd %s", PATH_TO_SNMPGET, community, - address, port, query_string); + sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s", + PATH_TO_SNMPGET, + community, + address, + port, + query_string); /* run the command */ child_process = spopen (command_line); @@ -380,11 +384,8 @@ process_arguments (int argc, char **argv) community = strdup (DEFAULT_COMMUNITY); } - if (port == NULL) { - if (argv[c] != NULL ) - port = argv[c]; - else - port = atoi (DEFAULT_PORT); + if (port == 0) { + port = atoi(DEFAULT_PORT); } return validate_arguments (); diff --git a/plugins/check_http.c b/plugins/check_http.c index 0b71266..ff39c59 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -52,11 +52,13 @@ enum { MAX_IPV4_HOSTLENGTH = 255, HTTP_PORT = 80, HTTPS_PORT = 443, - MAX_PORT = 65535 + MAX_PORT = 65535, + DEFAULT_MAX_REDIRS = 15 }; #ifdef HAVE_SSL int check_cert = FALSE; +int continue_after_check_cert = FALSE; int ssl_version = 0; int days_till_exp_warn, days_till_exp_crit; char *randbuff; @@ -125,7 +127,7 @@ int sd; int min_page_len = 0; int max_page_len = 0; int redir_depth = 0; -int max_depth = 15; +int max_depth = DEFAULT_MAX_REDIRS; char *http_method; char *http_method_proxy; char *http_post_data; @@ -203,7 +205,9 @@ process_arguments (int argc, char **argv) enum { INVERT_REGEX = CHAR_MAX + 1, - SNI_OPTION + SNI_OPTION, + MAX_REDIRS_OPTION, + CONTINUE_AFTER_CHECK_CERT }; int option = 0; @@ -231,6 +235,7 @@ process_arguments (int argc, char **argv) {"certificate", required_argument, 0, 'C'}, {"client-cert", required_argument, 0, 'J'}, {"private-key", required_argument, 0, 'K'}, + {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT}, {"useragent", required_argument, 0, 'A'}, {"header", required_argument, 0, 'k'}, {"no-body", no_argument, 0, 'N'}, @@ -242,6 +247,7 @@ process_arguments (int argc, char **argv) {"use-ipv6", no_argument, 0, '6'}, {"extended-perfdata", no_argument, 0, 'E'}, {"show-body", no_argument, 0, 'B'}, + {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION}, {0, 0, 0, 0} }; @@ -328,6 +334,11 @@ process_arguments (int argc, char **argv) } check_cert = TRUE; goto enable_ssl; +#endif + case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */ +#ifdef HAVE_SSL + continue_after_check_cert = TRUE; + break; #endif case 'J': /* use client certificate */ #ifdef HAVE_SSL @@ -373,6 +384,13 @@ process_arguments (int argc, char **argv) case SNI_OPTION: use_sni = TRUE; break; + case MAX_REDIRS_OPTION: + if (!is_intnonneg (optarg)) + usage2 (_("Invalid max_redirs count"), optarg); + else { + max_depth = atoi (optarg); + } + break; case 'f': /* onredirect */ if (!strcmp (optarg, "stickyport")) onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST|STICKY_PORT; @@ -971,9 +989,11 @@ check_http (void) elapsed_time_ssl = (double)microsec_ssl / 1.0e6; if (check_cert == TRUE) { result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit); - if (sd) close(sd); - np_net_ssl_cleanup(); - return result; + if (continue_after_check_cert == FALSE) { + if (sd) close(sd); + np_net_ssl_cleanup(); + return result; + } } } #endif /* HAVE_SSL */ @@ -1343,7 +1363,9 @@ check_http (void) #define HD2 URI_HTTP "://" URI_HOST "/" URI_PATH #define HD3 URI_HTTP "://" URI_HOST ":" URI_PORT #define HD4 URI_HTTP "://" URI_HOST -#define HD5 URI_PATH +/* relative reference redirect like //www.site.org/test https://tools.ietf.org/html/rfc3986 */ +#define HD5 "//" URI_HOST "/" URI_PATH +#define HD6 URI_PATH void redir (char *pos, char *status_line) @@ -1420,9 +1442,21 @@ redir (char *pos, char *status_line) use_ssl = server_type_check (type); i = server_port_check (use_ssl); } + /* URI_HTTP, URI_HOST, URI_PATH */ + else if (sscanf (pos, HD5, addr, url) == 2) { + if(use_ssl){ + strcpy (type,"https"); + } + else{ + strcpy (type, server_type); + } + xasprintf (&url, "/%s", url); + use_ssl = server_type_check (type); + i = server_port_check (use_ssl); + } /* URI_PATH */ - else if (sscanf (pos, HD5, url) == 1) { + else if (sscanf (pos, HD6, url) == 1) { /* relative url */ if ((url[0] != '/')) { if ((x = strrchr(server_url, '/'))) @@ -1453,8 +1487,8 @@ redir (char *pos, char *status_line) !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) && (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, url)) - die (STATE_WARNING, - _("HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n"), + die (STATE_CRITICAL, + _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), type, addr, i, url, (display_html ? "" : "")); strcpy (server_type, type); @@ -1598,7 +1632,11 @@ print_help (void) printf (" %s\n", _("Enable SSL/TLS hostname extension support (SNI)")); printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]"); printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443")); - printf (" %s\n", _("(when this option is used the URL is not checked.)")); + printf (" %s\n", _("(when this option is used the URL is not checked by default. You can use")); + printf (" %s\n", _(" --continue-after-certificate to override this behavior)")); + printf (" %s\n", "--continue-after-certificate"); + printf (" %s\n", _("Allows the HTTP check to continue after performing the certificate check.")); + printf (" %s\n", _("Does nothing unless -C is used.")); printf (" %s\n", "-J, --client-cert=FILE"); printf (" %s\n", _("Name of file that contains the client certificate (PEM format)")); printf (" %s\n", _("to be used in establishing the SSL session")); @@ -1657,9 +1695,11 @@ print_help (void) printf (" %s\n", "-f, --onredirect="); printf (" %s\n", _("How to handle redirected pages. sticky is like follow but stick to the")); printf (" %s\n", _("specified IP address. stickyport also ensures port stays the same.")); + printf (" %s\n", "--max-redirs=INTEGER"); + printf (" %s", _("Maximal number of redirects (default: ")); + printf ("%d)\n", DEFAULT_MAX_REDIRS); printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>"); printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)")); - printf (UT_WARN_CRIT); printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index bc7bd44..845a4f5 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -432,6 +432,9 @@ validate_arguments () set_thresholds(&entries_thresholds, warn_entries, crit_entries); } + if (ld_passwd==NULL) + ld_passwd = getenv("LDAP_PASSWORD"); + return OK; } @@ -465,7 +468,7 @@ print_help (void) printf (" %s\n", "-D [--bind]"); printf (" %s\n", _("ldap bind DN (if required)")); printf (" %s\n", "-P [--pass]"); - printf (" %s\n", _("ldap password (if required)")); + printf (" %s\n", _("ldap password (if required, or set the password through environment variable 'LDAP_PASSWORD')")); printf (" %s\n", "-T [--starttls]"); printf (" %s\n", _("use starttls mechanism introduced in protocol version 3")); printf (" %s\n", "-S [--ssl]"); diff --git a/plugins/check_load.c b/plugins/check_load.c index bf7b94b..00f7c87 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c @@ -1,41 +1,43 @@ /***************************************************************************** -* +* * Monitoring check_load plugin -* +* * License: GPL * Copyright (c) 1999-2007 Monitoring Plugins Development Team -* +* * Description: -* +* * This file contains the check_load plugin -* +* * This plugin tests the current system load average. -* -* +* +* * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program. If not, see . -* -* +* +* *****************************************************************************/ const char *progname = "check_load"; -const char *copyright = "1999-2007"; +const char *copyright = "1999-2022"; const char *email = "devel@monitoring-plugins.org"; -#include "common.h" -#include "runcmd.h" -#include "utils.h" -#include "popen.h" +#include "./common.h" +#include "./runcmd.h" +#include "./utils.h" +#include "./popen.h" + +#include #ifdef HAVE_SYS_LOADAVG_H #include @@ -68,7 +70,7 @@ double cload[3] = { 0.0, 0.0, 0.0 }; #define la15 la[2] char *status_line; -int take_into_account_cpus = 0; +bool take_into_account_cpus = false; static void get_threshold(char *arg, double *th) @@ -101,7 +103,7 @@ get_threshold(char *arg, double *th) int main (int argc, char **argv) { - int result; + int result = -1; int i; long numcpus; @@ -164,7 +166,7 @@ main (int argc, char **argv) sscanf (input_buffer, "%*[^l]load averages: %lf, %lf, %lf", &la1, &la5, &la15); } else { - printf (_("could not parse load from uptime %s: %s\n"), PATH_TO_UPTIME, result); + printf (_("could not parse load from uptime %s: %d\n"), PATH_TO_UPTIME, result); return STATE_UNKNOWN; } @@ -176,13 +178,6 @@ main (int argc, char **argv) # endif #endif - if (take_into_account_cpus == 1) { - if ((numcpus = GET_NUMBER_OF_CPUS()) > 0) { - la[0] = la[0] / numcpus; - la[1] = la[1] / numcpus; - la[2] = la[2] / numcpus; - } - } if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) { #ifdef HAVE_GETLOADAVG printf (_("Error in getloadavg()\n")); @@ -200,18 +195,49 @@ main (int argc, char **argv) result = STATE_OK; xasprintf(&status_line, _("load average: %.2f, %.2f, %.2f"), la1, la5, la15); + xasprintf(&status_line, ("total %s"), status_line); - for(i = 0; i < 3; i++) { - if(la[i] > cload[i]) { - result = STATE_CRITICAL; - break; - } - else if(la[i] > wload[i]) result = STATE_WARNING; + + double scaled_la[3] = { 0.0, 0.0, 0.0 }; + bool is_using_scaled_load_values = false; + + if (take_into_account_cpus == true && (numcpus = GET_NUMBER_OF_CPUS()) > 0) { + is_using_scaled_load_values = true; + + scaled_la[0] = la[0] / numcpus; + scaled_la[1] = la[1] / numcpus; + scaled_la[2] = la[2] / numcpus; + + char *tmp = NULL; + xasprintf(&tmp, _("load average: %.2f, %.2f, %.2f"), scaled_la[0], scaled_la[1], scaled_la[2]); + xasprintf(&status_line, "scaled %s - %s", tmp, status_line); } - printf("%s - %s|", state_text(result), status_line); - for(i = 0; i < 3; i++) - printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[i]); + for(i = 0; i < 3; i++) { + if (is_using_scaled_load_values) { + if(scaled_la[i] > cload[i]) { + result = STATE_CRITICAL; + break; + } + else if(scaled_la[i] > wload[i]) result = STATE_WARNING; + } else { + if(la[i] > cload[i]) { + result = STATE_CRITICAL; + break; + } + else if(la[i] > wload[i]) result = STATE_WARNING; + } + } + + printf("LOAD %s - %s|", state_text(result), status_line); + for(i = 0; i < 3; i++) { + if (is_using_scaled_load_values) { + printf("load%d=%.3f;;;0; ", nums[i], la[i]); + printf("scaled_load%d=%.3f;%.3f;%.3f;0; ", nums[i], scaled_la[i], wload[i], cload[i]); + } else { + printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[i]); + } + } putchar('\n'); if (n_procs_to_show > 0) { @@ -255,7 +281,7 @@ process_arguments (int argc, char **argv) get_threshold(optarg, cload); break; case 'r': /* Divide load average by number of CPUs */ - take_into_account_cpus = 1; + take_into_account_cpus = true; break; case 'V': /* version */ print_revision (progname, NP_VERSION); @@ -289,7 +315,6 @@ process_arguments (int argc, char **argv) } - static int validate_arguments (void) { @@ -310,7 +335,6 @@ validate_arguments (void) } - void print_help (void) { @@ -321,7 +345,7 @@ print_help (void) printf (_("This plugin tests the current system load average.")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); @@ -329,15 +353,15 @@ print_help (void) printf (UT_EXTRA_OPTS); printf (" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15"); - printf (" %s\n", _("Exit with WARNING status if load average exceeds WLOADn")); - printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15"); - printf (" %s\n", _("Exit with CRITICAL status if load average exceed CLOADn")); - printf (" %s\n", _("the load average format is the same used by \"uptime\" and \"w\"")); - printf (" %s\n", "-r, --percpu"); - printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); - printf (" %s\n", "-n, --procs-to-show=NUMBER_OF_PROCS"); - printf (" %s\n", _("Number of processes to show when printing the top consuming processes.")); - printf (" %s\n", _("NUMBER_OF_PROCS=0 disables this feature. Default value is 0")); + printf (" %s\n", _("Exit with WARNING status if load average exceeds WLOADn")); + printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15"); + printf (" %s\n", _("Exit with CRITICAL status if load average exceed CLOADn")); + printf (" %s\n", _("the load average format is the same used by \"uptime\" and \"w\"")); + printf (" %s\n", "-r, --percpu"); + printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); + printf (" %s\n", "-n, --procs-to-show=NUMBER_OF_PROCS"); + printf (" %s\n", _("Number of processes to show when printing the top consuming processes.")); + printf (" %s\n", _("NUMBER_OF_PROCS=0 disables this feature. Default value is 0")); printf (UT_SUPPORT); } @@ -345,8 +369,8 @@ print_help (void) void print_usage (void) { - printf ("%s\n", _("Usage:")); - printf ("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", progname); + printf ("%s\n", _("Usage:")); + printf ("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", progname); } #ifdef PS_USES_PROCPCPU @@ -384,8 +408,8 @@ static int print_top_consuming_processes() { #ifdef PS_USES_PROCPCPU qsort(chld_out.line + 1, chld_out.lines - 1, sizeof(char*), cmpstringp); #endif /* PS_USES_PROCPCPU */ - int lines_to_show = chld_out.lines < (n_procs_to_show + 1) - ? chld_out.lines : n_procs_to_show + 1; + int lines_to_show = chld_out.lines < (size_t)(n_procs_to_show + 1) + ? (int)chld_out.lines : n_procs_to_show + 1; for (i = 0; i < lines_to_show; i += 1) { printf("%s\n", chld_out.line[i]); } diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 914b40c..8b776ba 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -355,7 +355,7 @@ int best_offset_server(const ntp_server_results *slist, int nservers){ * - we also "manually" handle resolving host names and connecting, because * we have to do it in a way that our lazy macros don't handle currently :( */ double offset_request(const char *host, int *status){ - int i=0, j=0, ga_result=0, num_hosts=0, *socklist=NULL, respnum=0; + int i=0, ga_result=0, num_hosts=0, *socklist=NULL, respnum=0; int servers_completed=0, one_read=0, servers_readable=0, best_index=-1; time_t now_time=0, start_ts=0; ntp_message *req=NULL; @@ -488,7 +488,7 @@ double offset_request(const char *host, int *status){ /* cleanup */ /* FIXME: Not closing the socket to avoid re-use of the local port * which can cause old NTP packets to be read instead of NTP control - * pactets in jitter_request(). THERE MUST BE ANOTHER WAY... + * packets in jitter_request(). THERE MUST BE ANOTHER WAY... * for(j=0; j + #define WARN_DUPLICATES "DUPLICATES FOUND! " #define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */ @@ -138,7 +140,7 @@ main (int argc, char **argv) if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) { printf ("%s\n", cmd); die (STATE_UNKNOWN, - _("CRITICAL - Could not interpret output from ping command\n")); + _("CRITICAL - Could not interpret output from ping command\n")); } if (pl >= cpl || rta >= crta || rta < 0) @@ -163,10 +165,14 @@ main (int argc, char **argv) printf (""); /* Print performance data */ - printf("|%s", fperfdata ("rta", (double) rta, "ms", - wrta>0?TRUE:FALSE, wrta, - crta>0?TRUE:FALSE, crta, - TRUE, 0, FALSE, 0)); + if (pl != 100) { + printf("|%s", fperfdata ("rta", (double) rta, "ms", + wrta>0?TRUE:FALSE, wrta, + crta>0?TRUE:FALSE, crta, + TRUE, 0, FALSE, 0)); + } else { + printf("| rta=U;%f;%f;;", wrta, crta); + } printf(" %s\n", perfdata ("pl", (long) pl, "%", wpl>0?TRUE:FALSE, wpl, cpl>0?TRUE:FALSE, cpl, @@ -521,12 +527,13 @@ int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr) { if (strstr (buf, "Network is unreachable") || - strstr (buf, "Destination Net Unreachable") + strstr (buf, "Destination Net Unreachable") || + strstr (buf, "No route") ) die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr); - else if (strstr (buf, "Destination Host Unreachable")) + else if (strstr (buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable")) die (STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr); - else if (strstr (buf, "Destination Port Unreachable")) + else if (strstr (buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable")) die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr); else if (strstr (buf, "Destination Protocol Unreachable")) die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr); @@ -534,11 +541,11 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr) die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr); else if (strstr (buf, "Destination Host Prohibited")) die (STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr); - else if (strstr (buf, "Packet filtered")) + else if (strstr (buf, "Packet filtered") || strstr(buf, "Administratively prohibited")) die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr); else if (strstr (buf, "unknown host" )) die (STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr); - else if (strstr (buf, "Time to live exceeded")) + else if (strstr (buf, "Time to live exceeded") || strstr(buf, "Time exceeded")) die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr); else if (strstr (buf, "Destination unreachable: ")) die (STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr); @@ -547,7 +554,7 @@ error_scan (char buf[MAX_INPUT_BUFFER], const char *addr) if (warn_text == NULL) warn_text = strdup (_(WARN_DUPLICATES)); else if (! strstr (warn_text, _(WARN_DUPLICATES)) && - xasprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) + xasprintf (&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) die (STATE_UNKNOWN, _("Unable to realloc warn_text\n")); return (STATE_WARNING); } @@ -567,7 +574,7 @@ print_help (void) printf (_("Use ping to check connection statistics for a remote host.")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); @@ -577,29 +584,29 @@ print_help (void) printf (UT_IPv46); printf (" %s\n", "-H, --hostname=HOST"); - printf (" %s\n", _("host to ping")); - printf (" %s\n", "-w, --warning=THRESHOLD"); - printf (" %s\n", _("warning threshold pair")); - printf (" %s\n", "-c, --critical=THRESHOLD"); - printf (" %s\n", _("critical threshold pair")); - printf (" %s\n", "-p, --packets=INTEGER"); - printf (" %s ", _("number of ICMP ECHO packets to send")); - printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS); - printf (" %s\n", "-L, --link"); - printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); + printf (" %s\n", _("host to ping")); + printf (" %s\n", "-w, --warning=THRESHOLD"); + printf (" %s\n", _("warning threshold pair")); + printf (" %s\n", "-c, --critical=THRESHOLD"); + printf (" %s\n", _("critical threshold pair")); + printf (" %s\n", "-p, --packets=INTEGER"); + printf (" %s ", _("number of ICMP ECHO packets to send")); + printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS); + printf (" %s\n", "-L, --link"); + printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); - printf ("\n"); + printf ("\n"); printf ("%s\n", _("THRESHOLD is ,% where is the round trip average travel")); - printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and is the")); - printf ("%s\n", _("percentage of packet loss to trigger an alarm state.")); + printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and is the")); + printf ("%s\n", _("percentage of packet loss to trigger an alarm state.")); - printf ("\n"); + printf ("\n"); printf ("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss")); - printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output")); - printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); - printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); + printf ("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output")); + printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); + printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); printf (UT_SUPPORT); } @@ -607,7 +614,7 @@ print_help (void) void print_usage (void) { - printf ("%s\n", _("Usage:")); + printf ("%s\n", _("Usage:")); printf ("%s -H -w ,%% -c ,%%\n", progname); - printf (" [-p packets] [-t timeout] [-4|-6]\n"); + printf (" [-p packets] [-t timeout] [-4|-6]\n"); } diff --git a/plugins/check_procs.c b/plugins/check_procs.c index f7917c3..a025ee8 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -1,34 +1,34 @@ /***************************************************************************** -* +* * Monitoring check_procs plugin -* +* * License: GPL * Copyright (c) 2000-2008 Monitoring Plugins Development Team -* +* * Description: -* +* * This file contains the check_procs plugin -* +* * Checks all processes and generates WARNING or CRITICAL states if the * specified metric is outside the required threshold ranges. The metric * defaults to number of processes. Search filters can be applied to limit * the processes to check. -* -* +* +* * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program. If not, see . -* -* +* +* *****************************************************************************/ const char *progname = "check_procs"; @@ -50,7 +50,7 @@ const char *email = "devel@monitoring-plugins.org"; int process_arguments (int, char **); int validate_arguments (void); -int convert_to_seconds (char *); +int convert_to_seconds (char *); void print_help (void); void print_usage (void); @@ -230,9 +230,9 @@ main (int argc, char **argv) procseconds = convert_to_seconds(procetime); if (verbose >= 3) - printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procs, procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, + procpid, procppid, procpcpu, procstat, procetime, procprog, procargs); /* Ignore self */ @@ -265,7 +265,7 @@ main (int argc, char **argv) } } - if ((options & STAT) && (strstr (statopts, procstat))) + if ((options & STAT) && (strstr (procstat, statopts))) resultsum |= STAT; if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL)) resultsum |= ARGS; @@ -292,9 +292,9 @@ main (int argc, char **argv) procs++; if (verbose >= 2) { - printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, + procpid, procppid, procpcpu, procstat, procetime, procprog, procargs); } @@ -320,7 +320,7 @@ main (int argc, char **argv) result = max_state (result, i); } } - } + } /* This should not happen */ else if (verbose) { printf(_("Not parseable: %s"), input_buffer); @@ -332,7 +332,7 @@ main (int argc, char **argv) return STATE_UNKNOWN; } - if ( result == STATE_UNKNOWN ) + if ( result == STATE_UNKNOWN ) result = STATE_OK; /* Needed if procs found, but none match filter */ @@ -352,9 +352,9 @@ main (int argc, char **argv) if (metric != METRIC_PROCS) { printf (_("%d crit, %d warn out of "), crit, warn); } - } + } printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs); - + if (strcmp(fmt,"") != 0) { printf (_(" with %s"), fmt); } @@ -440,7 +440,7 @@ process_arguments (int argc, char **argv) break; case 'c': /* critical threshold */ critical_range = optarg; - break; + break; case 'w': /* warning threshold */ warning_range = optarg; break; @@ -542,11 +542,11 @@ process_arguments (int argc, char **argv) if ( strcmp(optarg, "PROCS") == 0) { metric = METRIC_PROCS; break; - } + } else if ( strcmp(optarg, "VSZ") == 0) { metric = METRIC_VSZ; break; - } + } else if ( strcmp(optarg, "RSS") == 0 ) { metric = METRIC_RSS; break; @@ -559,7 +559,7 @@ process_arguments (int argc, char **argv) metric = METRIC_ELAPSED; break; } - + usage4 (_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!")); case 'k': /* linux kernel thread filter */ kthread_filter = 1; @@ -642,7 +642,7 @@ convert_to_seconds(char *etime) { seconds = 0; for (ptr = etime; *ptr != '\0'; ptr++) { - + if (*ptr == '-') { hyphcnt++; continue; @@ -775,7 +775,7 @@ be the total number of running processes\n\n")); printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ"); printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K")); printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); - printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%")); + printf (" %s\n", _("Alert if CPU of any processes over 10\% or 20\%")); printf (UT_SUPPORT); } diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index d37c57c..c1e92df 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -55,6 +55,7 @@ enum { #define SMTP_EXPECT "220" #define SMTP_HELO "HELO " #define SMTP_EHLO "EHLO " +#define SMTP_LHLO "LHLO " #define SMTP_QUIT "QUIT\r\n" #define SMTP_STARTTLS "STARTTLS\r\n" #define SMTP_AUTH_LOGIN "AUTH LOGIN\r\n" @@ -102,6 +103,7 @@ int check_critical_time = FALSE; int verbose = 0; int use_ssl = FALSE; short use_ehlo = FALSE; +short use_lhlo = FALSE; short ssl_established = 0; char *localhostname = NULL; int sd; @@ -152,7 +154,9 @@ main (int argc, char **argv) return STATE_CRITICAL; } } - if(use_ehlo) + if(use_lhlo) + xasprintf (&helocmd, "%s%s%s", SMTP_LHLO, localhostname, "\r\n"); + else if(use_ehlo) xasprintf (&helocmd, "%s%s%s", SMTP_EHLO, localhostname, "\r\n"); else xasprintf (&helocmd, "%s%s%s", SMTP_HELO, localhostname, "\r\n"); @@ -197,7 +201,7 @@ main (int argc, char **argv) if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) { printf (_("recv() failed\n")); return STATE_WARNING; - } else if(use_ehlo){ + } else if(use_ehlo || use_lhlo){ if(strstr(buffer, "250 STARTTLS") != NULL || strstr(buffer, "250-STARTTLS") != NULL){ supports_tls=TRUE; @@ -470,6 +474,7 @@ process_arguments (int argc, char **argv) {"use-ipv4", no_argument, 0, '4'}, {"use-ipv6", no_argument, 0, '6'}, {"help", no_argument, 0, 'h'}, + {"lmtp", no_argument, 0, 'L'}, {"starttls",no_argument,0,'S'}, {"certificate",required_argument,0,'D'}, {"ignore-quit-failure",no_argument,0,'q'}, @@ -489,7 +494,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "+hVv46t:p:f:e:c:w:H:C:R:SD:F:A:U:P:q", + c = getopt_long (argc, argv, "+hVv46Lt:p:f:e:c:w:H:C:R:SD:F:A:U:P:q", longopts, &option); if (c == -1 || c == EOF) @@ -616,6 +621,9 @@ process_arguments (int argc, char **argv) use_ssl = TRUE; use_ehlo = TRUE; break; + case 'L': + use_lhlo = TRUE; + break; case '4': address_family = AF_INET; break; @@ -824,6 +832,8 @@ print_help (void) printf (" %s\n", _("SMTP AUTH username")); printf (" %s\n", "-P, --authpass=STRING"); printf (" %s\n", _("SMTP AUTH password")); + printf (" %s\n", "-L, --lmtp"); + printf (" %s\n", _("Send LHLO instead of HELO/EHLO")); printf (" %s\n", "-q, --ignore-quit-failure"); printf (" %s\n", _("Ignore failure when sending QUIT command to server")); @@ -850,6 +860,6 @@ print_usage (void) printf ("%s\n", _("Usage:")); printf ("%s -H host [-p port] [-4|-6] [-e expect] [-C command] [-R response] [-f from addr]\n", progname); printf ("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout] [-q]\n"); - printf ("[-F fqdn] [-S] [-D warn days cert expire[,crit days cert expire]] [-v] \n"); + printf ("[-F fqdn] [-S] [-L] [-D warn days cert expire[,crit days cert expire]] [-v] \n"); } diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index afc568b..2601ccd 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -113,6 +113,7 @@ char *authproto = NULL; char *privproto = NULL; char *authpasswd = NULL; char *privpasswd = NULL; +int nulloid = STATE_UNKNOWN; char **oids = NULL; size_t oids_size = 0; char *label; @@ -375,7 +376,7 @@ main (int argc, char **argv) } } - for (line=0, i=0; line < chld_out.lines; line++, i++) { + for (line=0, i=0; line < chld_out.lines && i < numoids ; line++, i++) { if(calculate_rate) conv = "%.10g"; else @@ -468,9 +469,20 @@ main (int argc, char **argv) /* Process this block for numeric comparisons */ /* Make some special values,like Timeticks numeric only if a threshold is defined */ if (thlds[i]->warning || thlds[i]->critical || calculate_rate) { + if (verbose > 2) { + print_thresholds(" thresholds", thlds[i]); + } ptr = strpbrk (show, "-0123456789"); - if (ptr == NULL) - die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show); + if (ptr == NULL){ + if (nulloid == 3) + die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show); + else if (nulloid == 0) + die (STATE_OK,_("No valid data returned (%s)\n"), show); + else if (nulloid == 1) + die (STATE_WARNING,_("No valid data returned (%s)\n"), show); + else if (nulloid == 2) + die (STATE_CRITICAL,_("No valid data returned (%s)\n"), show); + } while (i >= response_size) { response_size += OID_COUNT_STEP; response_value = realloc(response_value, response_size * sizeof(*response_value)); @@ -581,14 +593,16 @@ main (int argc, char **argv) if (warning_thresholds) { strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1); - strncat(perfstr, warning_thresholds, sizeof(perfstr)-strlen(perfstr)-1); + if(thlds[i]->warning && thlds[i]->warning->text) + strncat(perfstr, thlds[i]->warning->text, sizeof(perfstr)-strlen(perfstr)-1); } if (critical_thresholds) { if (!warning_thresholds) strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1); strncat(perfstr, ";", sizeof(perfstr)-strlen(perfstr)-1); - strncat(perfstr, critical_thresholds, sizeof(perfstr)-strlen(perfstr)-1); + if(thlds[i]->critical && thlds[i]->critical->text) + strncat(perfstr, thlds[i]->critical->text, sizeof(perfstr)-strlen(perfstr)-1); } strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1); @@ -656,6 +670,7 @@ process_arguments (int argc, char **argv) {"oid", required_argument, 0, 'o'}, {"object", required_argument, 0, 'o'}, {"delimiter", required_argument, 0, 'd'}, + {"nulloid", required_argument, 0, 'z'}, {"output-delimiter", required_argument, 0, 'D'}, {"string", required_argument, 0, 's'}, {"timeout", required_argument, 0, 't'}, @@ -700,7 +715,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:", + c = getopt_long (argc, argv, "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:z:", longopts, &option); if (c == -1 || c == EOF) @@ -811,6 +826,12 @@ process_arguments (int argc, char **argv) eval_method[j+1] |= CRIT_PRESENT; } break; + case 'z': /* Null OID Return Check */ + if (!is_integer (optarg)) + usage2 (_("Exit status must be a positive integer"), optarg); + else + nulloid = atoi(optarg); + break; case 's': /* string or substring */ strncpy (string_value, optarg, sizeof (string_value) - 1); string_value[sizeof (string_value) - 1] = 0; @@ -1161,7 +1182,7 @@ print_help (void) printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY); printf (" %s\n", "-U, --secname=USERNAME"); printf (" %s\n", _("SNMPv3 username")); - printf (" %s\n", "-A, --authpassword=PASSWORD"); + printf (" %s\n", "-A, --authpasswd=PASSWORD"); printf (" %s\n", _("SNMPv3 authentication password")); printf (" %s\n", "-X, --privpasswd=PASSWORD"); printf (" %s\n", _("SNMPv3 privacy password")); @@ -1176,6 +1197,14 @@ print_help (void) printf (" %s \"%s\"\n", _("Delimiter to use when parsing returned data. Default is"), DEFAULT_DELIMITER); printf (" %s\n", _("Any data on the right hand side of the delimiter is considered")); printf (" %s\n", _("to be the data that should be used in the evaluation.")); + printf (" %s\n", "-z, --nulloid=#"); + printf (" %s\n", _("If the check returns a 0 length string or NULL value")); + printf (" %s\n", _("This option allows you to choose what status you want it to exit")); + printf (" %s\n", _("Excluding this option renders the default exit of 3(STATE_UNKNOWN)")); + printf (" %s\n", _("0 = OK")); + printf (" %s\n", _("1 = WARNING")); + printf (" %s\n", _("2 = CRITICAL")); + printf (" %s\n", _("3 = UNKNOWN")); /* Tests Against Integers */ printf (" %s\n", "-w, --warning=THRESHOLD(s)"); diff --git a/plugins/check_swap.c b/plugins/check_swap.c index 0ff0c77..a607da1 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c @@ -1,30 +1,30 @@ /***************************************************************************** -* +* * Monitoring check_swap plugin -* +* * License: GPL * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net) * Copyright (c) 2000-2007 Monitoring Plugins Development Team -* +* * Description: -* +* * This file contains the check_swap plugin -* -* +* +* * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with this program. If not, see . -* -* +* +* *****************************************************************************/ const char *progname = "check_swap"; @@ -34,6 +34,9 @@ const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "popen.h" #include "utils.h" +#include +#include +#include #ifdef HAVE_DECL_SWAPCTL # ifdef HAVE_SYS_PARAM_H @@ -51,16 +54,19 @@ const char *email = "devel@monitoring-plugins.org"; # define SWAP_CONVERSION 1 #endif -int check_swap (int usp, float free_swap_mb, float total_swap_mb); +typedef struct { + int is_percentage; + uint64_t value; +} threshold_t; + +int check_swap (float free_swap_mb, float total_swap_mb); int process_arguments (int argc, char **argv); int validate_arguments (void); void print_usage (void); void print_help (void); -int warn_percent = 0; -int crit_percent = 0; -float warn_size_bytes = 0; -float crit_size_bytes = 0; +threshold_t warn; +threshold_t crit; int verbose; int allswaps; int no_swap_state = STATE_CRITICAL; @@ -68,9 +74,10 @@ int no_swap_state = STATE_CRITICAL; int main (int argc, char **argv) { - int percent_used, percent; - float total_swap_mb = 0, used_swap_mb = 0, free_swap_mb = 0; - float dsktotal_mb = 0, dskused_mb = 0, dskfree_mb = 0, tmp_mb = 0; + unsigned int percent_used, percent; + uint64_t total_swap_mb = 0, used_swap_mb = 0, free_swap_mb = 0; + uint64_t dsktotal_mb = 0, dskused_mb = 0, dskfree_mb = 0; + uint64_t tmp_KB = 0; int result = STATE_UNKNOWN; char input_buffer[MAX_INPUT_BUFFER]; #ifdef HAVE_PROC_MEMINFO @@ -116,10 +123,15 @@ main (int argc, char **argv) } fp = fopen (PROC_MEMINFO, "r"); while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) { - if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %f %f %f", &dsktotal_mb, &dskused_mb, &dskfree_mb) == 3) { - dsktotal_mb = dsktotal_mb / 1048576; /* Apply conversion */ - dskused_mb = dskused_mb / 1048576; - dskfree_mb = dskfree_mb / 1048576; + /* + * The following sscanf call looks for a line looking like: "Swap: 123 123 123" + * On which kind of system this format exists, I can not say, but I wanted to + * document this for people who are not adapt with sscanf anymore, like me + */ + if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %lu %lu %lu", &dsktotal_mb, &dskused_mb, &dskfree_mb) == 3) { + dsktotal_mb = dsktotal_mb / (1024 * 1024); /* Apply conversion */ + dskused_mb = dskused_mb / (1024 * 1024); + dskfree_mb = dskfree_mb / (1024 * 1024); total_swap_mb += dsktotal_mb; used_swap_mb += dskused_mb; free_swap_mb += dskfree_mb; @@ -128,21 +140,29 @@ main (int argc, char **argv) percent=100.0; else percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); - result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb)); + result = max_state (result, check_swap (dskfree_mb, dsktotal_mb)); if (verbose) - xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent); + xasprintf (&status, "%s [%lu (%d%%)]", status, dskfree_mb, 100 - percent); } } - else if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFre]%*[:] %f %*[k]%*[B]", str, &tmp_mb)) { + + /* + * The following sscanf call looks for lines looking like: "SwapTotal: 123" and "SwapFree: 123" + * This format exists at least on Debian Linux with a 5.* kernel + */ + else if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFreCchd]%*[:] %lu %*[k]%*[B]", str, &tmp_KB)) { if (verbose >= 3) { - printf("Got %s with %f\n", str, tmp_mb); + printf("Got %s with %lu\n", str, tmp_KB); } /* I think this part is always in Kb, so convert to mb */ if (strcmp ("Total", str) == 0) { - dsktotal_mb = tmp_mb / 1024; + dsktotal_mb = tmp_KB / 1024; } else if (strcmp ("Free", str) == 0) { - dskfree_mb = tmp_mb / 1024; + dskfree_mb = dskfree_mb + tmp_KB / 1024; + } + else if (strcmp ("Cached", str) == 0) { + dskfree_mb = dskfree_mb + tmp_KB / 1024; } } } @@ -227,7 +247,7 @@ main (int argc, char **argv) free_swap_mb += dskfree_mb; if (allswaps) { percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); - result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb)); + result = max_state (result, check_swap (dskfree_mb, dsktotal_mb)); if (verbose) xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent); } @@ -289,7 +309,7 @@ main (int argc, char **argv) if(allswaps && dsktotal_mb > 0){ percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); - result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb)); + result = max_state (result, check_swap (dskfree_mb, dsktotal_mb)); if (verbose) { xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent); } @@ -328,7 +348,7 @@ main (int argc, char **argv) if(allswaps && dsktotal_mb > 0){ percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb)); - result = max_state (result, check_swap (percent, dskfree_mb, dsktotal_mb)); + result = max_state (result, check_swap(dskfree_mb, dsktotal_mb)); if (verbose) { xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent); } @@ -355,41 +375,55 @@ main (int argc, char **argv) status = "- Swap is either disabled, not present, or of zero size. "; } - result = max_state (result, check_swap (percent_used, free_swap_mb, total_swap_mb)); - printf (_("SWAP %s - %d%% free (%d MB out of %d MB) %s|"), + result = max_state (result, check_swap(free_swap_mb, total_swap_mb)); + printf (_("SWAP %s - %d%% free (%dMB out of %dMB) %s|"), state_text (result), (100 - percent_used), (int) free_swap_mb, (int) total_swap_mb, status); - puts (perfdata ("swap", (long) free_swap_mb, "MB", - TRUE, (long) max (warn_size_bytes/(1024 * 1024), warn_percent/100.0*total_swap_mb), - TRUE, (long) max (crit_size_bytes/(1024 * 1024), crit_percent/100.0*total_swap_mb), + uint64_t warn_print = warn.value; + if (warn.is_percentage) warn_print = warn.value * (total_swap_mb *1024 *1024/100); + uint64_t crit_print = crit.value; + if (crit.is_percentage) crit_print = crit.value * (total_swap_mb *1024 *1024/100); + + puts (perfdata_uint64 ("swap", free_swap_mb *1024 *1024, "B", + TRUE, warn_print, + TRUE, crit_print, TRUE, 0, - TRUE, (long) total_swap_mb)); + TRUE, (long) total_swap_mb * 1024 * 1024)); return result; } - int -check_swap (int usp, float free_swap_mb, float total_swap_mb) +check_swap(float free_swap_mb, float total_swap_mb) { if (!total_swap_mb) return no_swap_state; - int result = STATE_UNKNOWN; - float free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */ - if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent)) - result = STATE_CRITICAL; - else if (crit_size_bytes > 0 && free_swap <= crit_size_bytes) - result = STATE_CRITICAL; - else if (usp >= 0 && warn_percent != 0 && usp >= (100.0 - warn_percent)) - result = STATE_WARNING; - else if (warn_size_bytes > 0 && free_swap <= warn_size_bytes) - result = STATE_WARNING; - else if (usp >= 0.0) - result = STATE_OK; - return result; + uint64_t free_swap = free_swap_mb * (1024 * 1024); /* Convert back to bytes as warn and crit specified in bytes */ + + if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL; + if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING; + + + uint64_t usage_percentage = ((total_swap_mb - free_swap_mb) / total_swap_mb) * 100; + + if (crit.is_percentage && + crit.value != 0 && + usage_percentage >= (100 - crit.value)) + { + return STATE_CRITICAL; + } + + if (warn.is_percentage && + warn.value != 0 && + usage_percentage >= (100 - warn.value)) + { + return STATE_WARNING; + } + + return STATE_OK; } @@ -422,42 +456,66 @@ process_arguments (int argc, char **argv) break; switch (c) { - case 'w': /* warning size threshold */ - if (is_intnonneg (optarg)) { - warn_size_bytes = (float) atoi (optarg); - break; - } - else if (strstr (optarg, ",") && - strstr (optarg, "%") && - sscanf (optarg, "%f,%d%%", &warn_size_bytes, &warn_percent) == 2) { - warn_size_bytes = floorf(warn_size_bytes); - break; - } - else if (strstr (optarg, "%") && - sscanf (optarg, "%d%%", &warn_percent) == 1) { - break; - } - else { - usage4 (_("Warning threshold must be integer or percentage!")); - } - case 'c': /* critical size threshold */ - if (is_intnonneg (optarg)) { - crit_size_bytes = (float) atoi (optarg); - break; - } - else if (strstr (optarg, ",") && - strstr (optarg, "%") && - sscanf (optarg, "%f,%d%%", &crit_size_bytes, &crit_percent) == 2) { - crit_size_bytes = floorf(crit_size_bytes); - break; - } - else if (strstr (optarg, "%") && - sscanf (optarg, "%d%%", &crit_percent) == 1) { - break; - } - else { - usage4 (_("Critical threshold must be integer or percentage!")); + case 'w': /* warning size threshold */ + { + /* + * We expect either a positive integer value without a unit, which means + * the unit is Bytes or a positive integer value and a percentage sign (%), + * which means the value must be with 0 and 100 and is relative to the total swap + */ + size_t length; + length = strlen(optarg); + + if (optarg[length - 1] == '%') { + /* It's percentage */ + warn.is_percentage = 1; + optarg[length - 1] = '\0'; + if (is_uint64(optarg, &warn.value)) { + if (warn.value > 100) { + usage4 (_("Warning threshold percentage must be <= 100!")); + } + } + break; + } else { + /* It's Bytes */ + warn.is_percentage = 0; + if (is_uint64(optarg, &warn.value)) { + break; + } else { + usage4 (_("Warning threshold be positive integer or percentage!")); + } + } } + case 'c': /* critical size threshold */ + { + /* + * We expect either a positive integer value without a unit, which means + * the unit is Bytes or a positive integer value and a percentage sign (%), + * which means the value must be with 0 and 100 and is relative to the total swap + */ + size_t length; + length = strlen(optarg); + + if (optarg[length - 1] == '%') { + /* It's percentage */ + crit.is_percentage = 1; + optarg[length - 1] = '\0'; + if (is_uint64(optarg, &crit.value)) { + if (crit.value> 100) { + usage4 (_("Critical threshold percentage must be <= 100!")); + } + } + break; + } else { + /* It's Bytes */ + crit.is_percentage = 0; + if (is_uint64(optarg, &crit.value)) { + break; + } else { + usage4 (_("Critical threshold be positive integer or percentage!")); + } + } + } case 'a': /* all swap */ allswaps = TRUE; break; @@ -465,6 +523,7 @@ process_arguments (int argc, char **argv) if ((no_swap_state = mp_translate_state(optarg)) == ERROR) { usage4 (_("no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3).")); } + break; case 'v': /* verbose */ verbose++; break; @@ -482,23 +541,6 @@ process_arguments (int argc, char **argv) c = optind; if (c == argc) return validate_arguments (); - if (warn_percent == 0 && is_intnonneg (argv[c])) - warn_percent = atoi (argv[c++]); - - if (c == argc) - return validate_arguments (); - if (crit_percent == 0 && is_intnonneg (argv[c])) - crit_percent = atoi (argv[c++]); - - if (c == argc) - return validate_arguments (); - if (warn_size_bytes == 0 && is_intnonneg (argv[c])) - warn_size_bytes = (float) atoi (argv[c++]); - - if (c == argc) - return validate_arguments (); - if (crit_size_bytes == 0 && is_intnonneg (argv[c])) - crit_size_bytes = (float) atoi (argv[c++]); return validate_arguments (); } @@ -508,17 +550,15 @@ process_arguments (int argc, char **argv) int validate_arguments (void) { - if (warn_percent == 0 && crit_percent == 0 && warn_size_bytes == 0 - && crit_size_bytes == 0) { + if (warn.value == 0 && crit.value == 0) { return ERROR; } - else if (warn_percent < crit_percent) { - usage4 - (_("Warning percentage should be more than critical percentage")); - } - else if (warn_size_bytes < crit_size_bytes) { - usage4 - (_("Warning free space should be more than critical free space")); + else if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) { + /* This is NOT triggered if warn and crit are different units, e.g warn is percentage + * and crit is absolut. We cannot determine the condition at this point since we + * dont know the value of total swap yet + */ + usage4(_("Warning should be more than critical")); } return OK; } @@ -534,7 +574,7 @@ print_help (void) printf ("%s\n", _("Check swap space on local machine.")); - printf ("\n\n"); + printf ("\n\n"); print_usage (); @@ -542,33 +582,32 @@ print_help (void) printf (UT_EXTRA_OPTS); printf (" %s\n", "-w, --warning=INTEGER"); - printf (" %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free")); - printf (" %s\n", "-w, --warning=PERCENT%%"); - printf (" %s\n", _("Exit with WARNING status if less than PERCENT of swap space is free")); - printf (" %s\n", "-c, --critical=INTEGER"); - printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free")); - printf (" %s\n", "-c, --critical=PERCENT%%"); - printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of swap space is free")); - printf (" %s\n", "-a, --allswaps"); - printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one")); - printf (" %s\n", "-n, --no-swap="); - printf (" %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state)); + printf (" %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free")); + printf (" %s\n", "-w, --warning=PERCENT%"); + printf (" %s\n", _("Exit with WARNING status if less than PERCENT of swap space is free")); + printf (" %s\n", "-c, --critical=INTEGER"); + printf (" %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free")); + printf (" %s\n", "-c, --critical=PERCENT%"); + printf (" %s\n", _("Exit with CRITICAL status if less than PERCENT of swap space is free")); + printf (" %s\n", "-a, --allswaps"); + printf (" %s\n", _("Conduct comparisons for all swap partitions, one by one")); + printf (" %s\n", "-n, --no-swap="); + printf (" %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state)); printf (UT_VERBOSE); printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked.")); - printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); + printf ("%s\n", _("Notes:")); + printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked.")); + printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); printf (UT_SUPPORT); } - void print_usage (void) { printf ("%s\n", _("Usage:")); - printf (" %s [-av] -w %% -c %%\n",progname); - printf (" -w -c [-n ]\n"); + printf (" %s [-av] -w %% -c %%\n",progname); + printf (" -w -c [-n ]\n"); } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index e9e56a5..0de37a2 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -402,7 +402,10 @@ get_ups_variable (const char *varname, char *buf, size_t buflen) /* create the command string to send to the UPS daemon */ /* Add LOGOUT to avoid read failure logs */ - sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname); + if (snprintf (send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", ups_name, varname) >= sizeof(send_buffer)) { + printf("%s\n", _("UPS name to long for buffer")); + return ERROR; + } /* send the command to the daemon and get a response back */ if (process_tcp_request diff --git a/plugins/picohttpparser/Makefile.in b/plugins/picohttpparser/Makefile.in index 1cbeb10..b2a9704 100644 --- a/plugins/picohttpparser/Makefile.in +++ b/plugins/picohttpparser/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,23 +15,61 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,7 +88,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = plugins/picohttpparser -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -154,28 +190,59 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libpicohttpparser_a_AR = $(AR) $(ARFLAGS) libpicohttpparser_a_LIBADD = am_libpicohttpparser_a_OBJECTS = picohttpparser.$(OBJEXT) libpicohttpparser_a_OBJECTS = $(am_libpicohttpparser_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/picohttpparser.Po am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libpicohttpparser_a_SOURCES) DIST_SOURCES = $(libpicohttpparser_a_SOURCES) am__can_run_installinfo = \ @@ -183,14 +250,35 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1316,6 +1404,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1343,14 +1432,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/picohttpparser/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu plugins/picohttpparser/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1364,10 +1452,11 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libpicohttpparser.a: $(libpicohttpparser_a_OBJECTS) $(libpicohttpparser_a_DEPENDENCIES) $(EXTRA_libpicohttpparser_a_DEPENDENCIES) - -rm -f libpicohttpparser.a - $(libpicohttpparser_a_AR) libpicohttpparser.a $(libpicohttpparser_a_OBJECTS) $(libpicohttpparser_a_LIBADD) - $(RANLIB) libpicohttpparser.a + $(AM_V_at)-rm -f libpicohttpparser.a + $(AM_V_AR)$(libpicohttpparser_a_AR) libpicohttpparser.a $(libpicohttpparser_a_OBJECTS) $(libpicohttpparser_a_LIBADD) + $(AM_V_at)$(RANLIB) libpicohttpparser.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1375,28 +1464,34 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/picohttpparser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/picohttpparser.Po@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1404,26 +1499,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1435,15 +1519,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1452,11 +1532,29 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1526,7 +1624,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/picohttpparser.Po -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1572,7 +1670,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/picohttpparser.Po -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1593,18 +1691,21 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/plugins/picohttpparser/picohttpparser.c b/plugins/picohttpparser/picohttpparser.c index 74ccc3e..d9680b7 100644 --- a/plugins/picohttpparser/picohttpparser.c +++ b/plugins/picohttpparser/picohttpparser.c @@ -242,7 +242,7 @@ static const char *is_complete(const char *buf, const char *buf_end, size_t last } while (0) /* returned pointer is always within [buf, buf_end), or null */ -static const char *parse_http_version(const char *buf, const char *buf_end, int *minor_version, int *ret) +static const char *parse_http_version(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *ret) { /* we want at least [HTTP/1.] to try to parse */ if (buf_end - buf < 9) { @@ -254,9 +254,13 @@ static const char *parse_http_version(const char *buf, const char *buf_end, int EXPECT_CHAR_NO_CHECK('T'); EXPECT_CHAR_NO_CHECK('P'); EXPECT_CHAR_NO_CHECK('/'); - EXPECT_CHAR_NO_CHECK('1'); - EXPECT_CHAR_NO_CHECK('.'); - PARSE_INT(minor_version, 1); + PARSE_INT(major_version, 1); + if (*major_version == 1) { + EXPECT_CHAR_NO_CHECK('.'); + PARSE_INT(minor_version, 1); + } else { + *minor_version = 0; + } return buf; } @@ -339,7 +343,7 @@ static const char *parse_headers(const char *buf, const char *buf_end, struct ph } static const char *parse_request(const char *buf, const char *buf_end, const char **method, size_t *method_len, const char **path, - size_t *path_len, int *minor_version, struct phr_header *headers, size_t *num_headers, + size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t max_headers, int *ret) { /* skip first empty line (some clients add CRLF after POST content) */ @@ -364,7 +368,7 @@ static const char *parse_request(const char *buf, const char *buf_end, const cha *ret = -1; return NULL; } - if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == NULL) { + if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) { return NULL; } if (*buf == '\015') { @@ -381,7 +385,7 @@ static const char *parse_request(const char *buf, const char *buf_end, const cha } int phr_parse_request(const char *buf_start, size_t len, const char **method, size_t *method_len, const char **path, - size_t *path_len, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len) + size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len) { const char *buf = buf_start, *buf_end = buf_start + len; size_t max_headers = *num_headers; @@ -391,6 +395,7 @@ int phr_parse_request(const char *buf_start, size_t len, const char **method, si *method_len = 0; *path = NULL; *path_len = 0; + *major_version = -1; *minor_version = -1; *num_headers = 0; @@ -400,7 +405,7 @@ int phr_parse_request(const char *buf_start, size_t len, const char **method, si return r; } - if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, minor_version, headers, num_headers, max_headers, + if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, major_version, minor_version, headers, num_headers, max_headers, &r)) == NULL) { return r; } @@ -408,11 +413,11 @@ int phr_parse_request(const char *buf_start, size_t len, const char **method, si return (int)(buf - buf_start); } -static const char *parse_response(const char *buf, const char *buf_end, int *minor_version, int *status, const char **msg, +static const char *parse_response(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *status, const char **msg, size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t max_headers, int *ret) { /* parse "HTTP/1.x" */ - if ((buf = parse_http_version(buf, buf_end, minor_version, ret)) == NULL) { + if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) { return NULL; } /* skip space */ @@ -451,13 +456,14 @@ static const char *parse_response(const char *buf, const char *buf_end, int *min return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret); } -int phr_parse_response(const char *buf_start, size_t len, int *minor_version, int *status, const char **msg, size_t *msg_len, +int phr_parse_response(const char *buf_start, size_t len, int *major_version, int *minor_version, int *status, const char **msg, size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t last_len) { const char *buf = buf_start, *buf_end = buf + len; size_t max_headers = *num_headers; int r; + *major_version = -1; *minor_version = -1; *status = 0; *msg = NULL; @@ -470,7 +476,7 @@ int phr_parse_response(const char *buf_start, size_t len, int *minor_version, in return r; } - if ((buf = parse_response(buf, buf_end, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) == NULL) { + if ((buf = parse_response(buf, buf_end, major_version, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) == NULL) { return r; } diff --git a/plugins/picohttpparser/picohttpparser.h b/plugins/picohttpparser/picohttpparser.h index 0849f84..8f13b36 100644 --- a/plugins/picohttpparser/picohttpparser.h +++ b/plugins/picohttpparser/picohttpparser.h @@ -49,10 +49,10 @@ struct phr_header { /* returns number of bytes consumed if successful, -2 if request is partial, * -1 if failed */ int phr_parse_request(const char *buf, size_t len, const char **method, size_t *method_len, const char **path, size_t *path_len, - int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len); + int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len); /* ditto */ -int phr_parse_response(const char *_buf, size_t len, int *minor_version, int *status, const char **msg, size_t *msg_len, +int phr_parse_response(const char *_buf, size_t len, int *major_version, int *minor_version, int *status, const char **msg, size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t last_len); /* ditto */ diff --git a/plugins/sslutils.c b/plugins/sslutils.c index 14f6579..286273f 100644 --- a/plugins/sslutils.c +++ b/plugins/sslutils.c @@ -134,7 +134,7 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int return STATE_CRITICAL; } if (cert && privkey) { - SSL_CTX_use_certificate_file(c, cert, SSL_FILETYPE_PEM); + SSL_CTX_use_certificate_chain_file(c, cert); SSL_CTX_use_PrivateKey_file(c, privkey, SSL_FILETYPE_PEM); #ifdef USE_OPENSSL if (!SSL_CTX_check_private_key(c)) { diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis deleted file mode 100644 index 9b9f805..0000000 --- a/plugins/t/NPTest.cache.travis +++ /dev/null @@ -1,54 +0,0 @@ -{ - 'NP_ALLOW_SUDO' => 'yes', - 'NP_DNS_SERVER' => '8.8.8.8', - 'NP_GOOD_NTP_SERVICE' => '', - 'NP_HOST_DHCP_RESPONSIVE' => '', - 'NP_HOST_HPJD_PORT_INVALID' => '161', - 'NP_HOST_HPJD_PORT_VALID' => '', - 'NP_HOSTNAME_INVALID_CIDR' => '130.133.8.39/30', - 'NP_HOSTNAME_INVALID' => 'nosuchhost', - 'NP_HOSTNAME_VALID_CIDR' => '130.133.8.41/30', - 'NP_HOSTNAME_VALID_IP' => '130.133.8.40', - 'NP_HOSTNAME_VALID' => 'monitoring-plugins.org', - 'NP_HOSTNAME_VALID_REVERSE' => 'orwell.monitoring-plugins.org.', - 'NP_HOST_NONRESPONSIVE' => '10.0.0.1', - 'NP_HOST_RESPONSIVE' => 'localhost', - 'NP_HOST_SMB' => '', - 'NP_HOST_SNMP' => '', - 'NP_HOST_TCP_FTP' => '', - 'NP_HOST_TCP_HPJD' => '', - 'NP_HOST_TCP_HTTP2' => 'test.monitoring-plugins.org', - 'NP_HOST_TCP_HTTP' => 'localhost', - 'NP_HOST_TCP_IMAP' => 'imap.web.de', - 'NP_HOST_TCP_JABBER' => 'jabber.org', - 'NP_HOST_TCP_LDAP' => 'localhost', - 'NP_HOST_TCP_POP' => 'pop.web.de', - 'NP_HOST_TCP_PROXY' => 'localhost', - 'NP_HOST_TCP_SMTP' => 'localhost', - 'NP_HOST_TCP_SMTP_NOTLS' => '', - 'NP_HOST_TCP_SMTP_TLS' => '', - 'NP_HOST_TLS_CERT' => 'localhost, - 'NP_HOST_TLS_HTTP' => 'localhost', - 'NP_HOST_UDP_TIME' => 'none', - 'NP_INTERNET_ACCESS' => 'yes', - 'NP_LDAP_BASE_DN' => 'cn=admin,dc=nodomain', - 'NP_MOUNTPOINT2_VALID' => '/media/ramdisk', - 'NP_MOUNTPOINT_VALID' => '/', - 'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test', - 'NP_MYSQL_SERVER' => 'localhost', - 'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock', - 'NP_MYSQL_WITH_SLAVE' => '', - 'NP_MYSQL_WITH_SLAVE_LOGIN' => '', - 'NP_NO_NTP_SERVICE' => 'localhost', - 'NP_PORT_TCP_PROXY' => '3128', - 'NP_SMB_SHARE' => '', - 'NP_SMB_SHARE_DENY' => '', - 'NP_SMB_SHARE_SPC' => '', - 'NP_SMB_VALID_USER' => '', - 'NP_SMB_VALID_USER_PASS' => '', - 'NP_SNMP_COMMUNITY' => '', - 'NP_SNMP_USER' => '', - 'NP_SSH_CONFIGFILE' => '~/.ssh/config', - 'NP_SSH_HOST' => 'localhost', - 'NP_SSH_IDENTITY' => '~/.ssh/id_rsa' -} diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t index a4f1dfb..693f4b2 100644 --- a/plugins/t/check_curl.t +++ b/plugins/t/check_curl.t @@ -9,7 +9,7 @@ use Test::More; use POSIX qw/mktime strftime/; use NPTest; -plan tests => 58; +plan tests => 57; my $successOutput = '/OK.*HTTP.*second/'; @@ -84,7 +84,7 @@ like( $res->output, '/^Host: testhost:8001\s*$/ms', "Host Header OK" ); like( $res->output, '/CURLOPT_URL: http:\/\/'.$host_tcp_http.':80\//ms', "Url OK" ); SKIP: { - skip "No internet access", 3 if $internet_access eq "no"; + skip "No internet access", 4 if $internet_access eq "no"; $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -S"); like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" ); @@ -95,7 +95,7 @@ SKIP: { $res = NPTest->testCmd("./$plugin -v -H $host_tls_http:443 -S -p 443"); like( $res->output, '/^Host: '.$host_tls_http.'\s*$/ms', "Host Header OK" ); - $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -p 443"); + $res = NPTest->testCmd("./$plugin -v -H $host_tls_http -D -S -p 443"); like( $res->output, '/(^Host: '.$host_tls_http.'\s*$)|(cURL returned 60)/ms', "Host Header OK" ); }; @@ -120,7 +120,7 @@ SKIP: { cmp_ok( $res->return_code, "==", 0, "And also when not found"); } SKIP: { - skip "No internet access", 16 if $internet_access eq "no"; + skip "No internet access", 28 if $internet_access eq "no"; $res = NPTest->testCmd( "./$plugin --ssl $host_tls_http" @@ -188,13 +188,7 @@ SKIP: { like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); like ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' ); - $res = NPTest->testCmd( - "./$plugin --ssl -H www.e-paycobalt.com" - ); - cmp_ok( $res->return_code, "==", 0, "Can read https for www.e-paycobalt.com (uses AES certificate)" ); - - - $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f follow" ); + $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f curl" ); is( $res->return_code, 0, "Redirection based on location is okay"); $res = NPTest->testCmd( "./$plugin -H www.mozilla.com --extended-perfdata" ); diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t index fdd8769..ec527e7 100644 --- a/plugins/t/check_disk.t +++ b/plugins/t/check_disk.t @@ -88,8 +88,9 @@ $result = NPTest->testCmd( ); $_ = $result->perf_output; my ($warn_absth_data, $crit_absth_data, $total_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/); -is ($warn_absth_data, $total_absth_data - 20, "Wrong warning in perf data using absolute thresholds"); -is ($crit_absth_data, $total_absth_data - 10, "Wrong critical in perf data using absolute thresholds"); +# default unit is MiB, but perfdata is always bytes +is ($warn_absth_data, $total_absth_data - (20 * (2 ** 20)), "Wrong warning in perf data using absolute thresholds"); +is ($crit_absth_data, $total_absth_data - (10 * (2 ** 20)), "Wrong critical in perf data using absolute thresholds"); # Then check percent thresholds. $result = NPTest->testCmd( @@ -119,7 +120,7 @@ like ( $result->only_output, qr/$more_free/, "Have disk name in text"); $result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" ); cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free"); $_ = $result->output; -my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+) MB .* (\d+) MB /g); +my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+)MiB .* (\d+)MiB /g); my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2; diff --git a/plugins/t/check_dns.t b/plugins/t/check_dns.t index cdfbe60..afb2062 100644 --- a/plugins/t/check_dns.t +++ b/plugins/t/check_dns.t @@ -10,7 +10,7 @@ use NPTest; plan skip_all => "check_dns not compiled" unless (-x "check_dns"); -plan tests => 19; +plan tests => 23; my $successOutput = '/DNS OK: [\.0-9]+ seconds? response time/'; @@ -105,3 +105,11 @@ cmp_ok( $res->return_code, '==', 0, "Got expected address"); $res = NPTest->testCmd("./check_dns -H $hostname_valid -a $hostname_invalid_cidr -t 5"); cmp_ok( $res->return_code, '==', 2, "Got wrong address"); like ( $res->output, "/^DNS CRITICAL.*expected '$hostname_invalid_cidr' but got '$hostname_valid_ip'".'$/', "Output OK"); + +$res = NPTest->testCmd("./check_dns -H $hostname_valid -n"); +cmp_ok( $res->return_code, '==', 2, "Found $hostname_valid"); +like ( $res->output, "/^DNS CRITICAL.*Domain '$hostname_valid' was found by the server:/", "Output OK"); + +$res = NPTest->testCmd("./check_dns -H $hostname_invalid -n"); +cmp_ok( $res->return_code, '==', 0, "Did not find $hostname_invalid"); +like ( $res->output, $successOutput, "Output OK" ); diff --git a/plugins/t/check_fping.t b/plugins/t/check_fping.t index 342b0a7..67b357b 100644 --- a/plugins/t/check_fping.t +++ b/plugins/t/check_fping.t @@ -5,34 +5,30 @@ # use strict; -use Test; +use Test::More; use NPTest; -use vars qw($tests); - -BEGIN {$tests = 4; plan tests => $tests} - -my $successOutput = '/^FPING OK - /'; -my $failureOutput = '/^FPING CRITICAL - /'; - my $host_responsive = getTestParameter("NP_HOST_RESPONSIVE", "The hostname of system responsive to network requests", "localhost"); my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1"); my $hostname_invalid = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost"); -my $t; +my $res; my $fping = qx(which fping 2> /dev/null); chomp($fping); if( ! -x "./check_fping") { - $t += skipMissingCmd( "./check_fping", $tests ); + plan skip_all => "check_fping not found, skipping tests"; } -elsif ( $> != 0 && (!$fping || ! -u $fping)) { - $t += skipMsg( "./check_fping", $tests ); +elsif ( !$fping || !-x $fping ) { + plan skip_all => "fping not found or cannot be executed, skipping tests"; } else { - $t += checkCmd( "./check_fping $host_responsive", 0, $successOutput ); - $t += checkCmd( "./check_fping $host_nonresponsive", [ 1, 2 ] ); - $t += checkCmd( "./check_fping $hostname_invalid", [ 1, 2 ] ); -} + plan tests => 3; + $res = NPTest->testCmd( "./check_fping $host_responsive" ); + cmp_ok( $res->return_code, '==', 0, "Responsive host returns OK"); -exit(0) if defined($Test::Harness::VERSION); -exit($tests - $t); + $res = NPTest->testCmd( "./check_fping $host_nonresponsive" ); + cmp_ok( $res->return_code, '==', 2, "Non-Responsive host returns Critical"); + + $res = NPTest->testCmd( "./check_fping $hostname_invalid" ); + cmp_ok( $res->return_code, '==', 3, "Invalid host returns Unknown"); +} diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t index e92681e..0c86622 100644 --- a/plugins/t/check_http.t +++ b/plugins/t/check_http.t @@ -9,7 +9,7 @@ use Test::More; use POSIX qw/mktime strftime/; use NPTest; -plan tests => 50; +plan tests => 49; my $successOutput = '/OK.*HTTP.*second/'; @@ -103,7 +103,7 @@ SKIP: { cmp_ok( $res->return_code, "==", 0, "And also when not found"); } SKIP: { - skip "No internet access", 16 if $internet_access eq "no"; + skip "No internet access", 23 if $internet_access eq "no"; $res = NPTest->testCmd( "./$plugin --ssl $host_tls_http" @@ -135,7 +135,7 @@ SKIP: { # run some certificate checks with faketime SKIP: { - skip "No faketime binary found", 12 if !$faketime; + skip "No faketime binary found", 7 if !$faketime; $res = NPTest->testCmd("LC_TIME=C TZ=UTC ./$plugin -C 1 $host_tls_http"); like($res->output, qr/OK - Certificate '$host_tls_cert' will expire on/, "Catch cert output"); is( $res->return_code, 0, "Catch cert output exit code" ); @@ -166,12 +166,6 @@ SKIP: { like ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' ); like ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' ); - $res = NPTest->testCmd( - "./$plugin --ssl -H www.e-paycobalt.com" - ); - cmp_ok( $res->return_code, "==", 0, "Can read https for www.e-paycobalt.com (uses AES certificate)" ); - - $res = NPTest->testCmd( "./$plugin -H www.mozilla.com -u /firefox -f follow" ); is( $res->return_code, 0, "Redirection based on location is okay"); diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t index 55f6f75..bba8947 100644 --- a/plugins/t/check_load.t +++ b/plugins/t/check_load.t @@ -11,10 +11,12 @@ use NPTest; my $res; my $loadValue = "[0-9]+\.?[0-9]+"; -my $successOutput = "/^OK - load average: $loadValue, $loadValue, $loadValue/"; -my $failureOutput = "/^CRITICAL - load average: $loadValue, $loadValue, $loadValue/"; +my $successOutput = "/^LOAD OK - total load average: $loadValue, $loadValue, $loadValue/"; +my $successScaledOutput = "/^LOAD OK - scaled load average: $loadValue, $loadValue, $loadValue - total load average: $loadValue, $loadValue, $loadValue/"; +my $failureOutput = "/^LOAD CRITICAL - total load average: $loadValue, $loadValue, $loadValue/"; +my $failurScaledOutput = "/^LOAD CRITICAL - scaled load average: $loadValue, $loadValue, $loadValue - total load average: $loadValue, $loadValue, $loadValue/"; -plan tests => 11; +plan tests => 13; $res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100" ); cmp_ok( $res->return_code, 'eq', 0, "load not over 100"); @@ -26,7 +28,7 @@ like( $res->output, $failureOutput, "Output OK"); $res = NPTest->testCmd( "./check_load -r -w 0,0,0 -c 0,0,0" ); cmp_ok( $res->return_code, 'eq', 2, "Load over 0 with per cpu division"); -like( $res->output, $failureOutput, "Output OK"); +like( $res->output, $failurScaledOutput, "Output OK"); $res = NPTest->testCmd( "./check_load -w 100 -c 100,110" ); cmp_ok( $res->return_code, 'eq', 0, "Plugin can handle non-triplet-arguments"); @@ -34,3 +36,8 @@ like( $res->output, $successOutput, "Output OK"); like( $res->perf_output, "/load1=$loadValue;100.000;100.000/", "Test handling of non triplet thresholds (load1)"); like( $res->perf_output, "/load5=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load5)"); like( $res->perf_output, "/load15=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load15)"); + + +$res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100 -r" ); +cmp_ok( $res->return_code, 'eq', 0, "load not over 100"); +like( $res->output, $successScaledOutput, "Output OK"); diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t index e44adc9..de9e0f0 100644 --- a/plugins/t/check_swap.t +++ b/plugins/t/check_swap.t @@ -8,9 +8,9 @@ use strict; use Test::More tests => 8; use NPTest; -my $successOutput = '/^SWAP OK - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/'; -my $failureOutput = '/^SWAP CRITICAL - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/'; -my $warnOutput = '/^SWAP WARNING - [0-9]+\% free \([0-9]+ MB out of [0-9]+ MB\)/'; +my $successOutput = '/^SWAP OK - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/'; +my $failureOutput = '/^SWAP CRITICAL - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/'; +my $warnOutput = '/^SWAP WARNING - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/'; my $result; diff --git a/plugins/tests/certs/.gitignore b/plugins/tests/certs/.gitignore new file mode 100644 index 0000000..79acaaa --- /dev/null +++ b/plugins/tests/certs/.gitignore @@ -0,0 +1,2 @@ +/*.csr +/*.srl diff --git a/plugins/tests/certs/client-cert.pem b/plugins/tests/certs/client-cert.pem new file mode 100644 index 0000000..5709750 --- /dev/null +++ b/plugins/tests/certs/client-cert.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDtDCCApwCAQIwDQYJKoZIhvcNAQELBQAwgaAxCzAJBgNVBAYTAkRFMRAwDgYD +VQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gxGzAZBgNVBAoMEk1vbml0b3Jp +bmcgUGx1Z2luczEkMCIGA1UEAwwbTW9uaXRvcmluZyBQbHVnaW5zIENsaWVudENB +MSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5nLXBsdWdpbnMub3JnMB4X +DTIxMDIyODIxMDIxMloXDTMwMTEyODIxMDIxMlowgZ4xCzAJBgNVBAYTAkRFMRAw +DgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gxGzAZBgNVBAoMEk1vbml0 +b3JpbmcgUGx1Z2luczEiMCAGA1UEAwwZTW9uaXRvcmluZyBQbHVnaW5zIENsaWVu +dDErMCkGCSqGSIb3DQEJARYcZGV2ZWxAbW9uaXRvcmluZy1wbHVnaW5zLm9yZzCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3EiqfFPomm5dZQPGYG5SrF +rPvyqseXTzCkwUIUzGf+Sfm3s13zx7e3ije/04yKhTXgK59EQ793q7E2aWhSOz3s +hwKKdylFkOIyc5jgbAfF1/pLZMK209rLt/mMRksXCRXYrHdTjRMx1ev4C2407+8Y +8qkf77DuYQmUqCQe7DPOvqLeagdw9JcLGmQNTKHg3fl6wyRl5K1Bsy+qXu2XvEjZ +0Ng7n8LHjOUkTqUEJndOxci9gL5cHU5ttul/GW34dKOtTuMU/pQX6/ywYusOGVOx +RYI76OolRqj5BqbNctDIB/obe2RLo+UVx74/0jAxtH4XS23pYjO7NUpJcytsVG8C +AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAYfaY5n4pCq0NWPCdeVVRr4nr+GAfv1TC +/PKcGuEoJZKt7TQT+OOA5yeZMZb53OvtA49D1r9aoJzWe946KElWOEBqxDRi5Cdr +wkqpwGcPT2RfAqA3/cvQZ1XsquboXrCf7ajdl5OC64bs2jkqCFh9gnxuI140g8Ar +Njol8BFxRPaYWOnwuQwmh/2t0FJqr3WSD85HrNqtxUSNGbTdSsvCfgF0v7QVkvLG +3/cbx6z5hxzj2JUjhMnCvn+EbasoJt4xyBFvg67Q2229SMwu9YNqS63GVoKUqhCB +4Gl5v31qx8dAFKuRvnez3ze/6oohwmakZkst4hcQdgZocHhzesvKlg== +-----END CERTIFICATE----- diff --git a/plugins/tests/certs/client-key.pem b/plugins/tests/certs/client-key.pem new file mode 100644 index 0000000..09b6761 --- /dev/null +++ b/plugins/tests/certs/client-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDNxIqnxT6JpuXW +UDxmBuUqxaz78qrHl08wpMFCFMxn/kn5t7Nd88e3t4o3v9OMioU14CufREO/d6ux +NmloUjs97IcCincpRZDiMnOY4GwHxdf6S2TCttPay7f5jEZLFwkV2Kx3U40TMdXr ++AtuNO/vGPKpH++w7mEJlKgkHuwzzr6i3moHcPSXCxpkDUyh4N35esMkZeStQbMv +ql7tl7xI2dDYO5/Cx4zlJE6lBCZ3TsXIvYC+XB1Obbbpfxlt+HSjrU7jFP6UF+v8 +sGLrDhlTsUWCO+jqJUao+QamzXLQyAf6G3tkS6PlFce+P9IwMbR+F0tt6WIzuzVK +SXMrbFRvAgMBAAECggEBALtc2pB3p0E6KpAiEU0pvCRdSO1FgsIpAd+eNadRPur2 +fi+XWQkUwGeGBaJL1npja3aqP65PP40pj7nWfNaUAgOZyznCEU0QXiPJor6yo0vU +l5v+aKpwRao107i0RRF80TYGTMx+1LeEqnCqNOZN56gERHlBbkTiWpOZvBzf1143 +oegTcyM6+Ee6+FYNhHaDyIYD0md1S2wGR+IBPet6HwWiakLNKahFPa7lOLIKfmmD +iTtifcbf4724wSe44a0uTeP4JrquZSeIKakm8MEmffmYqpycnaakYefd0Xc5UEsH ++VbhKpOWGY3d8FKHqUsTa+6QyXb2uFPo6A+yWm0pdJECgYEA7Prd5sbWACvXOcHT +ONDBAgyfAVDQwOXi3D4dk6D5mg+/jxl5ZQY5slszJrwsLFtoEzXtYpNfTy3cpNOp +JLbBDZYnqty+5tD8t3/Zv2IBXCAgvuk5CgfJWP5FNAfiyUEE6Vbp6J/5/vAnODsa +fxZryN5UsH0X8ew7AlbfcVNyj4kCgYEA3khetIgn+GR6sv9jFRdCT6aJbp0xMsms +6F4v3L5FG4Kp+SwDHL1bVOhieJ5g8odYp9hDbgTEEqbJfNmyCOu9+OQmZ/mztku7 +6reU8HhYBIvi+hFeJmvqKpdIgU0Zveg4Bst5QordmhPk8AHjBC4xvQ++uh7rwYKd +WVsS08bGDjcCgYEAlAuNARUKsASzakOqHv5a9VrJIttH7povBYRQmd+gzxwzgcRa +UEB5XvEWnYZE2lkoRYgVCtYiXqa6BsasDmGVbVV25okNQckhd8mJUMR7MQBpNJsi +pR+EK/J9bSnYBf52gQdpDYiTdy60ca6KuQZaw5wRsEgV426+1pFK+dM16HECgYBY +cTsdYb9lmbUoW201CxgbUQwFsw3MQ2pE2pT4o8wjcg3nUpe6a61XT08+5uV0Gl4w +CmBp+gN52Fr7DjNEUWg5C64sWLIkqmWOspTUSU3cITyiex6W8wEtCRyUNfU0Fp2U +Nol87HvXvmqtBFMraqXnr8gXjg4H5MxurUoEcWaEaQKBgCT4iIGZwW0Qf2rkFC7B +xObzVGefivVVbaf8/c/LRO8TMLdnExkShMOmCzHeHV4mMEZDLbMOusHCI7xm10EX +l3L1I1Kyqnhm1RH3e7TVWgkTmIDW3V5Fgrhm1jx5Iz6et4sb4Uh+bZq9tTLyqfZY +8s0yJUrfpjRggfk7eUs5s7aY +-----END PRIVATE KEY----- diff --git a/plugins/tests/certs/clientca-cert.pem b/plugins/tests/certs/clientca-cert.pem new file mode 100644 index 0000000..9ce7cd7 --- /dev/null +++ b/plugins/tests/certs/clientca-cert.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEIzCCAwugAwIBAgIUL9Jfp5zv5B29NgDsNEFU2OM/UHswDQYJKoZIhvcNAQEL +BQAwgaAxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZN +dW5pY2gxGzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEkMCIGA1UEAwwbTW9u +aXRvcmluZyBQbHVnaW5zIENsaWVudENBMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBt +b25pdG9yaW5nLXBsdWdpbnMub3JnMB4XDTIxMDIyODIxMDIxMVoXDTMwMTEyODIx +MDIxMVowgaAxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQH +DAZNdW5pY2gxGzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEkMCIGA1UEAwwb +TW9uaXRvcmluZyBQbHVnaW5zIENsaWVudENBMSswKQYJKoZIhvcNAQkBFhxkZXZl +bEBtb25pdG9yaW5nLXBsdWdpbnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAyxiWsGrsJFHw3VR0pqHviXUfbfKMw8LaCxI5EQZfInsMVkBIGWEW +tFW6qDuAOsMdzsrKOnQRNNt852ts/0Uz++z8zysoauAGpc4JnCZuM5A1DU5CFXBx +w6Ax+1ft3UsTt8C6kfLfs8mPCbtNVqAHrMrIqDxsNSRRxQSqkzp1vD8rwSKcbB1h +u2+lut1bEqMe7dp89jKOtc6G/1tHUFQuLAGFoX/qk9yPscmQNzL6YbLP4m9r/416 +PsxWsAfyY97hmoYo6mSCue5LmeanOsjf4Kzq90hIJRwrpiUGmxGjW+tPLEhQBZw6 +C2wHyN74YIJYX2xREz2ijT0mgsqdhO5ZxwIDAQABo1MwUTAdBgNVHQ4EFgQUtsP9 +Z3fKkhmFp97Kh/cW/UqHMIMwHwYDVR0jBBgwFoAUtsP9Z3fKkhmFp97Kh/cW/UqH +MIMwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEApO5o+YECwTEv +s+elDJZQ20UYwDSiU9Lpf4EcdnRv6FAb5UlhfRTH3ZdKCc/HX7kcKuy3PsF+b8Pw +EusoKito9OlNEOF5HYAI9/J54/qceqn+SC0INsISeE19PvT0dma7lBSj4OvBv0IS +GYbdztVaKLWqYgYs0mcEzteUc4MZcy1/C+Ru1i1Kp2s9/vIeAw2PV2+kpWtw88Pb +FRJomGngP/hQdwniayCltG/Q1smS4iFEHNI5ayLZj1qJGMHwzqGiRr4KknJKfHzv +fl4NQaFyMY31s1FRIS6QVIRFHVzUAlKZTdzwqEJygg3fUS9n9uDBnyDI/sW7DQuj +yjSmYRS1hw== +-----END CERTIFICATE----- diff --git a/plugins/tests/certs/clientca-key.pem b/plugins/tests/certs/clientca-key.pem new file mode 100644 index 0000000..a939f03 --- /dev/null +++ b/plugins/tests/certs/clientca-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDLGJawauwkUfDd +VHSmoe+JdR9t8ozDwtoLEjkRBl8iewxWQEgZYRa0VbqoO4A6wx3Oyso6dBE023zn +a2z/RTP77PzPKyhq4AalzgmcJm4zkDUNTkIVcHHDoDH7V+3dSxO3wLqR8t+zyY8J +u01WoAesysioPGw1JFHFBKqTOnW8PyvBIpxsHWG7b6W63VsSox7t2nz2Mo61zob/ +W0dQVC4sAYWhf+qT3I+xyZA3Mvphss/ib2v/jXo+zFawB/Jj3uGahijqZIK57kuZ +5qc6yN/grOr3SEglHCumJQabEaNb608sSFAFnDoLbAfI3vhgglhfbFETPaKNPSaC +yp2E7lnHAgMBAAECggEAJqAWiJbNMlsjI/Tb+pTxqYLM52wpuVFlhpWApOxBS517 +SywOikUcvE9RoI0wZfyVvq5yp4tLenID3z9fC21t5Yu8yOm8VhclLINy8G+epc/X +RyCLEOjBuiLNXq/qXRvaNChDU16NjPPYcFFe9AqbaxFl+BkFu1Wc94tbpYSIv7Qt +L6iBxUTXdgvLM5doa9AazIQzJx+jUsVCgRVQQf3zsLqtp9hH0Pfq+KWFIy5TA+bG +0NFmYyQndRjtT0ihWGuNU7D8AXa+z7abzk+HydIlx4D//vGgdNq92QYPdnu2BBya +5Fs6LkmkUonX/I8FbkLbRKkQWNPMt+Ks21t3xcVBgQKBgQDn4HuHVCPwxgU6Mv+5 +0sHJXYBq1fDzrUt0+iTtYkRqViX+9Mp4sUpYgXext/wXFLcKzQQp5B0g1dLYLSRS +KwhsdiN0J7ZcoP1GMStw8zsayRTf8C3WRU6aACqyFiylYbyh56XomfYgwhja/7l9 +pzpVJD9ecG+mLVAyAkJtK2JolQKBgQDgOZfvrQj0L4QG+9E5VmFc3PE+6k3g+zDO +MWqTSh0fOHqdTEyet4bMC4DogXGVsvw0/UKwbrGHOk0+ltA5VyKUtK/whSutr/+S +nhCHljhV0XUN/I3OFcvezFjM3g0oC4uy1cL30hoM4IfeHM1d3EYse9N1Y/Op+mR6 +Sx+fEku16wKBgQC0KQ7RjuZ95N2a4pUe5En9EtD8MU4Nhs/iC5k1d+yAUn8jIT9P +lzCUo8NEKheMN2Qg2Dor8jlPkdNIc4qM7TKWUxQo49IlFlCzgPCnydRac3HsrMhw +e1ke/pIt3FzEArR1d27I0xcRTL3TKm4M2ynPjWJPFj0peHue33KNL/A+IQKBgEpL +awd0Sxo1wEZcG9gmwf32C01wbzuTn3lCsHB7Ryj4GtCR3nVclCJ50U24zjzu4Fhi +bj1tgA8xhzSs3fOR5phlQkKsrWtQfJtFGm8CnEn7LBDlVMsrN7Dr/qRrEuro4HHy +GDbq+8y2fO5glr955BqLMOadprf0imRnDeQ0OLffAoGBAJio+X+xpglgMOC4BeH9 +9LcYi9nUEw8MDJNGo9/3e0XKA7spd3HShLDvt8YZhFJ2m168qBpGfezuw0+jpWxy +PV9q0dokAgDx4pvCzIKaptZ1D30CWXJZHq25VK1tA41PCUIOh8JD5+R0MpxA5rn2 +DbqL4Vq7K7K0imGENYhHdyM+ +-----END PRIVATE KEY----- diff --git a/plugins/tests/certs/clientchain-cert.pem b/plugins/tests/certs/clientchain-cert.pem new file mode 100644 index 0000000..acd1e3e --- /dev/null +++ b/plugins/tests/certs/clientchain-cert.pem @@ -0,0 +1,45 @@ +-----BEGIN CERTIFICATE----- +MIIDuTCCAqECAQQwDQYJKoZIhvcNAQELBQAwgaAxCzAJBgNVBAYTAkRFMRAwDgYD +VQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gxGzAZBgNVBAoMEk1vbml0b3Jp +bmcgUGx1Z2luczEkMCIGA1UEAwwbTW9uaXRvcmluZyBQbHVnaW5zIENsaWVudENB +MSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5nLXBsdWdpbnMub3JnMB4X +DTIxMDIyODIxMDIxMloXDTMwMTEyODIxMDIxMlowgaMxCzAJBgNVBAYTAkRFMRAw +DgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gxGzAZBgNVBAoMEk1vbml0 +b3JpbmcgUGx1Z2luczEnMCUGA1UEAwweTW9uaXRvcmluZyBQbHVnaW5zIENsaWVu +dENoYWluMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5nLXBsdWdpbnMu +b3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAphvoJBbi/rDvm3+X +8xok0sLCJvCRuUpSbU5wEmREQlkoOGmWK4l6r1JyOphKRBo8+n2MxPiCMvAmTrqx +VlBmkcmyrwWj392Nga+2SLWTziASk5nFrrhV6U79PkgXnETV2Wk1/FNVIFkB8N+B +undsTce8LLiCs7hfA5CK7ctJg8fqsAsmgKBNGzBRWwkbvxZPd6xlY6foIJeD7PQ2 +elvTmrD6WXSZq7GshFpDEkL3AifqrPMdsTnbBpyGgJ/fBM1b2dx9k53e25mgEQmn +iSuYQxn08BsUT0FOvav8ksZLBQz859fuqCtwhikpODO635fD9zK5YkBPlVl+/5xo +SvKOywIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBh4zeSKjENfY+VDLtPssaNQz2a +R1ioY40lZ0WoihDSrfG32dqTK/R2YsLKBABjJ7uRYS1NIBMrtS2OktK8BWD5IUTF +FuGuWilu6IWiTKZrLiZh1rsilNDVqwhorRPxDnbF+qVt9EMIvzKnKdJLGF+CWHN9 +yYJDeTD8MK5uR7zUJR3PsgW4ve5pFTi7z2UJ/xRvgOds6bmeeQnvaWDEL7k2+hrr +0G899A086NL3htzaOnIllg0xo2D1o4ToncAJn+cUQVJmHZSg9HYiD4Lg3z8uXPAl +rt/MX7dBm4dnImLXbSg7N3e8FdUtz+kZT9z+beKAeIe9JTbpxtsVUTzUZBBA +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID2jCCAsKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UEBhMCREUx +EDAOBgNVBAgMB0JhdmFyaWExDzANBgNVBAcMBk11bmljaDEbMBkGA1UECgwSTW9u +aXRvcmluZyBQbHVnaW5zMSQwIgYDVQQDDBtNb25pdG9yaW5nIFBsdWdpbnMgQ2xp +ZW50Q0ExKzApBgkqhkiG9w0BCQEWHGRldmVsQG1vbml0b3JpbmctcGx1Z2lucy5v +cmcwHhcNMjEwMjI4MjEwMjEyWhcNMzAxMTI4MjEwMjEyWjCBqjELMAkGA1UEBhMC +REUxEDAOBgNVBAgMB0JhdmFyaWExDzANBgNVBAcMBk11bmljaDEbMBkGA1UECgwS +TW9uaXRvcmluZyBQbHVnaW5zMS4wLAYDVQQDDCVNb25pdG9yaW5nIFBsdWdpbnMg +Q2xpZW50SW50ZXJtZWRpYXRlMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9y +aW5nLXBsdWdpbnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +6rUgOZ9pAOxrcgeeOT3Vmu1YmY2O/C9tXhpKzDzjTaWUzcdDg00KdsjXfgbDzSiV +uvMzjX63aKpmqeFG+05D2VzQGit3knqerUgl10FnTotiJGF5CU5/gY1aPxTJ7rj2 +tD6LINBkJcPTyQ4MoJT19pssvCax9erY1RxoXxLblJ+31C+VvrftdmBP4nVKXK26 +4anb1oUQhkgpXpJimJBmF+v7NbDs1Wh21Be80KXUh9SKgePhSQblr2QlRcA7jLgJ +4PMjZ+KYF+da+4RB7s+DvTXVDMn9AL84E1w5Ut1E8XZV+u4RjWPvNdhK/7GnuxOR +C9SdxonqkPQ8hiI7thP9bQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBCwUAA4IBAQDKQeiDbyr0/7sEhX33MmTDv84GeWgKl9qqHecx+d/0vImb +c8XHK0PDa4lVqo/BW4P1hjKzpt2DW35kbOhuqGqM0lasIczef43aCDDEBLwstAe6 +qMoyWGVGoAQbpwT3li2pMrsIYoPwMvoSGNUphjrkdpviff2POkLly7a5RrR1X3qt +Dai6eYbeMCr9NdgW7AZ5++/sKlFoe+zVk/Ed31s4D2lh3awrApZhVgcoquPmEwpt +gm+OgRmHw50U4SF3ZaJPwDyLMbx+clH/bgUg0+Za9e53Br1NtGKmw7hh/7CG/hy0 +yxeLd930pH4vZu7s0XM56N/ckkfUzRkAH8dSmhH4 +-----END CERTIFICATE----- diff --git a/plugins/tests/certs/clientchain-key.pem b/plugins/tests/certs/clientchain-key.pem new file mode 100644 index 0000000..0263604 --- /dev/null +++ b/plugins/tests/certs/clientchain-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCmG+gkFuL+sO+b +f5fzGiTSwsIm8JG5SlJtTnASZERCWSg4aZYriXqvUnI6mEpEGjz6fYzE+IIy8CZO +urFWUGaRybKvBaPf3Y2Br7ZItZPOIBKTmcWuuFXpTv0+SBecRNXZaTX8U1UgWQHw +34G6d2xNx7wsuIKzuF8DkIrty0mDx+qwCyaAoE0bMFFbCRu/Fk93rGVjp+ggl4Ps +9DZ6W9OasPpZdJmrsayEWkMSQvcCJ+qs8x2xOdsGnIaAn98EzVvZ3H2Tnd7bmaAR +CaeJK5hDGfTwGxRPQU69q/ySxksFDPzn1+6oK3CGKSk4M7rfl8P3MrliQE+VWX7/ +nGhK8o7LAgMBAAECggEAAfTqMyKh4eYrrGVAYPi53lG0/8htrwUVG3yFDXJo628p +biCwSCsCavZJqi8JEOxOM5UvB1L2FauGh/7i/+VKkAUUOcOTPpvZguGTACBDcXYn +Qd3Z2kkJmgn4Kbenr4uQCVOX8zT4F710rGW1nYCyoefsa4pw37UYSW52dH6kiwzW +9k4X251nDMl/twBdOcjZbL768IEa5l4nySLpUNwfrVbSb1NzBoH0dVioh3DTLjt6 +gaShW4eIpaKczht1U97n6/7WNLl6vHX/mR99k/py8OhzhR1ccYpd2IfSHAWyQT0M +K8BoNnkjICrr9oc0FCr2BVJa3IzKHlhukF4GTZiGYQKBgQDWCHTwAmwL4FFEBVhj +pZne/sjaZc8TzPPxA8SkmxwDIZrM7tSu7qUuYgWTM432jZbLILWTyGfXf2PpqyF6 +wOpoBJj1ETkre8ZfRmYvsSvS5vtjF3Drszol+XvZnOclfB5VG3m5P2vYkQ8wI9OE +Y5jUBgDj0RsCNd8QnrC1u54U/wKBgQDGrd5y8S9kUT0P0lkZit7bYjSPJExtClXt +V7YNTjELrVCdc0jranxBWaub8NP3e6TGTi9HiQWvk2eOAS2qyccqlK4+YAK5XO3D +EpFUNNcClq8CErw2POuCAKajrPuSp6vd6q8h4lTzDExVctQS4R9fRKKFBKkPUV5G +UiKFllnKNQKBgQDBGIQXfLfpxwjKK2BhFihKDOc8UhmOrZtvV4zzTJTrJkg4l0f+ +QoN34ytQcHSleXwP6oSmvWkh/GYxjBj6XE2eZndwsYc4ecSwdB0A7gCxl345Gg7g +NqRBWmGoJGxNXzsmYVFiFZvAmK5xKgFMMWbR8lCfOCn7xopmviSC8K9gFQKBgFRb +KmH/SbH8VELNews/TVQ0pEBKlzCM/OLjJOcNVgGxOtM/Say677sHibeST0168AFK +3QQwh3t+yK8gjPVA6xGHQ1w0g7OUY1c6IP5x2QC+XdwxfDxDLXNrN1WzcrVX/78f +j/CBGrR/ekGlmanSb/GRQLfdvLJGSBLveLzjk4gpAoGBANN9RUm/aRz3dDBWex46 +kJ15xKJfLZiUeyDvY5+5d7YF4/tw5LU4XmKQNhiojHecykrTzPUMaGyMrbMPNn32 +WFW9CKMjuBEwWpMDJJb1/5NLEvpwu++sr7bUPZkQl76ot6OqgNHodbP8ATqrNr80 +5b8FrEN1LyfkTbabxNyAWcA0 +-----END PRIVATE KEY----- diff --git a/plugins/tests/certs/clientintermediate-cert.pem b/plugins/tests/certs/clientintermediate-cert.pem new file mode 100644 index 0000000..608a8fa --- /dev/null +++ b/plugins/tests/certs/clientintermediate-cert.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID2jCCAsKgAwIBAgIBAzANBgkqhkiG9w0BAQsFADCBoDELMAkGA1UEBhMCREUx +EDAOBgNVBAgMB0JhdmFyaWExDzANBgNVBAcMBk11bmljaDEbMBkGA1UECgwSTW9u +aXRvcmluZyBQbHVnaW5zMSQwIgYDVQQDDBtNb25pdG9yaW5nIFBsdWdpbnMgQ2xp +ZW50Q0ExKzApBgkqhkiG9w0BCQEWHGRldmVsQG1vbml0b3JpbmctcGx1Z2lucy5v +cmcwHhcNMjEwMjI4MjEwMjEyWhcNMzAxMTI4MjEwMjEyWjCBqjELMAkGA1UEBhMC +REUxEDAOBgNVBAgMB0JhdmFyaWExDzANBgNVBAcMBk11bmljaDEbMBkGA1UECgwS +TW9uaXRvcmluZyBQbHVnaW5zMS4wLAYDVQQDDCVNb25pdG9yaW5nIFBsdWdpbnMg +Q2xpZW50SW50ZXJtZWRpYXRlMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9y +aW5nLXBsdWdpbnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +6rUgOZ9pAOxrcgeeOT3Vmu1YmY2O/C9tXhpKzDzjTaWUzcdDg00KdsjXfgbDzSiV +uvMzjX63aKpmqeFG+05D2VzQGit3knqerUgl10FnTotiJGF5CU5/gY1aPxTJ7rj2 +tD6LINBkJcPTyQ4MoJT19pssvCax9erY1RxoXxLblJ+31C+VvrftdmBP4nVKXK26 +4anb1oUQhkgpXpJimJBmF+v7NbDs1Wh21Be80KXUh9SKgePhSQblr2QlRcA7jLgJ +4PMjZ+KYF+da+4RB7s+DvTXVDMn9AL84E1w5Ut1E8XZV+u4RjWPvNdhK/7GnuxOR +C9SdxonqkPQ8hiI7thP9bQIDAQABoxMwETAPBgNVHRMBAf8EBTADAQH/MA0GCSqG +SIb3DQEBCwUAA4IBAQDKQeiDbyr0/7sEhX33MmTDv84GeWgKl9qqHecx+d/0vImb +c8XHK0PDa4lVqo/BW4P1hjKzpt2DW35kbOhuqGqM0lasIczef43aCDDEBLwstAe6 +qMoyWGVGoAQbpwT3li2pMrsIYoPwMvoSGNUphjrkdpviff2POkLly7a5RrR1X3qt +Dai6eYbeMCr9NdgW7AZ5++/sKlFoe+zVk/Ed31s4D2lh3awrApZhVgcoquPmEwpt +gm+OgRmHw50U4SF3ZaJPwDyLMbx+clH/bgUg0+Za9e53Br1NtGKmw7hh/7CG/hy0 +yxeLd930pH4vZu7s0XM56N/ckkfUzRkAH8dSmhH4 +-----END CERTIFICATE----- diff --git a/plugins/tests/certs/clientintermediate-key.pem b/plugins/tests/certs/clientintermediate-key.pem new file mode 100644 index 0000000..13f6887 --- /dev/null +++ b/plugins/tests/certs/clientintermediate-key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDqtSA5n2kA7Gty +B545PdWa7ViZjY78L21eGkrMPONNpZTNx0ODTQp2yNd+BsPNKJW68zONfrdoqmap +4Ub7TkPZXNAaK3eSep6tSCXXQWdOi2IkYXkJTn+BjVo/FMnuuPa0Posg0GQlw9PJ +DgyglPX2myy8JrH16tjVHGhfEtuUn7fUL5W+t+12YE/idUpcrbrhqdvWhRCGSCle +kmKYkGYX6/s1sOzVaHbUF7zQpdSH1IqB4+FJBuWvZCVFwDuMuAng8yNn4pgX51r7 +hEHuz4O9NdUMyf0AvzgTXDlS3UTxdlX67hGNY+812Er/sae7E5EL1J3GieqQ9DyG +Iju2E/1tAgMBAAECggEACyYJXtNUoIeaXvM/r8ZhJBfMEpcnyJDUKBklnmfyABky +ZUfmzBDXw2as3b6ihFc+LYAp3bm8KouVjtI1lfBUxrli5StVZa7PZLm9mmjv6Eo0 +ojfDEQ8afWPieoaZRO6iQVOLNkbPyv9vSuiQ7vvEZy9dw54u69h47j6IMqPprDiG +ropUNeGAvTnh1Vf9/8aCHEvHUNHcc4zjzGiQ+E60JgnbpGVeJKoeiMgrQE0yjweo +KyKA47Y6vqP6+AxAaPplXtmrx2UCbMjktHNvLvg42+2UlLS5roiwmJYEN9c6iT6t +y82MJrjEFGZyLG2u6ZQANSJiIWaCnOyT1o2deJ8NoQKBgQD7UxivDTuljQD0so+E +JX9UaFZ9PgS+8LC9v56PciL4XQ7bcCVP5vVgZZPABiQ9i989Wq7qI042Jrfu5qtE +SthlOAu80GvAQV+Oujwo7ZzM6ciQtjMsj63r2uayWXnmQ07QcIg7x7y161Pt9Bqr +LIDrqHziIj/lzT7+6QKZaQwFaQKBgQDvEuSC14CBlMhy2jji71kB/3Ya3c+8dP+A +kQZL9wEWK4a4dm8IaTS8jl1/luhQUzFRMyh2rWaTqqigSe3dvs5DRblhE5NPwTSI +9TO7t1EnzjW3R8LxZZsySyiSFnZ/8mR0empxq0Mov37OdXBj0tXuuzREf/hwijWh +WuLxJUSjZQKBgAIDZ2Y3l+u6lnBfYdDwL/XwJAk6zvTsnq3WdCG4C1mr/St62YGr +WvnbtnRKWE356d7m9BHCGKVMaBrM1EBmzRb6fPWVQde3blmJWmQFi0UE9mtaWkyY +Fg+WoFR7bQOQNHhs/lpkPjnC2dhFJVWLtLiuj9mL5rEjlMab/T5XXhZJAoGBAMEP +FZ8fXbPGrTQqSwPfWpZFcF9zvbynEmkFM/uGRMddcNZnNXSqWJ7nrFNLTuEGvW2g +DU4A6zPV/YQrDz4hRjmHBZOCFlSyZbUvpY4yFAQ7/p66AY+kiHZNwT5vi1P5Luvs +qyaNsZcnRMR+i7rg2EeHv0aNvNdMlNBvL5KikNINAoGAU2P/phdwJOUcqgHavQcQ +ureTEyZ5i5AeNomNeHSj0slG24V9nxOqEL7D00JKln7oAPovYBUWocEnF39uBJe0 +p0Hy7fCCK6EI8/0QyiQuuZmJfDEEvjQqE6irONNH63r2UwDEpDNGFvGsZNuWHLZc +SXADu5oSNu6o6IydiyOx528= +-----END PRIVATE KEY----- diff --git a/plugins/tests/certs/expired-cert.pem b/plugins/tests/certs/expired-cert.pem index 77a9166..87fc8e4 100644 --- a/plugins/tests/certs/expired-cert.pem +++ b/plugins/tests/certs/expired-cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIIEETCCAvmgAwIBAgIUFDsP6WnV/uqeQMpD/DYSqouE13kwDQYJKoZIhvcNAQEL +MIIEETCCAvmgAwIBAgIUVDKkhcUoYFnjYCw12tScPIqQzqIwDQYJKoZIhvcNAQEL BQAwgZcxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZN dW5pY2gxGzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEbMBkGA1UEAwwSTW9u aXRvcmluZyBQbHVnaW5zMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5n -LXBsdWdpbnMub3JnMB4XDTA4MDEwMTExMDAyNloXDTA4MDEwMjExMDAyNlowgZcx +LXBsdWdpbnMub3JnMB4XDTA4MDEwMTEyMDAwMFoXDTA4MDEwMjEyMDAwMFowgZcx CzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gx GzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEbMBkGA1UEAwwSTW9uaXRvcmlu ZyBQbHVnaW5zMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5nLXBsdWdp -bnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyeHKwKFjJWUX -YHKsisypUf9dHlIPQAISyGP1BX6UL26ZLvE6kKbx3LFQ9W2POGoQWlzFiB1soGeV -WDd0U0JtWdCKmOXWdcXpupQlTSUtRCMDQkfqLN8GR5TBTd73rezp5mz08nMfLwu0 -p5VQ191Ui8JHFgrAOalAn8Uw5De8vj4VmTXmU5NJ2UFoC0ddU/Th/lwRCayHc1cn -MVq2F7c/uhMUUQYNBmJy0pxoHawp+j9NKl/xIYsjgQNgahQyNuswuGHjaEwhPu+7 -G03XsW4ehu+H1898M/MkSln6LQAU1syoJ8ypPM8tV+zgx4uwj7udnZ2hceN95uW7 -0PWg5DQyUwIDAQABo1MwUTAdBgNVHQ4EFgQUt9ps3KJ1XiMuy/ijFBjMzf6jgwkw -HwYDVR0jBBgwFoAUt9ps3KJ1XiMuy/ijFBjMzf6jgwkwDwYDVR0TAQH/BAUwAwEB -/zANBgkqhkiG9w0BAQsFAAOCAQEAVPBZwMHbrnHFbmhbcPuvYd5cxk0uSVNAUzsl -2biCq5P+ZHo10VHGygXtdV4utqk/IrAt2u5qSxycWPStCtAgTd3Q8ncfjOkaHM4z -2bxTkhLyQeU8NWPuDBqDszo2GOaFTv+lm36LEKiAfqB1tjQVePSkycdrWIhkamBV -EgMe6uHLdU7QQk1ajQfrBdakN1beqki/dKieA6gm+XF/QS4SSYINmsHB/2X5cT9U -b/KMB8xurCnuJQuk1P4VsSkJCOSeHjWZgK9pKNdsIJZr4wDVfhjQgU0XT6xakSf7 -eCaHtO0VKsbLZoiTmpxidjsdYiXyeKYIQNtUpTjyJ5V/cZsq9w== +bnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwg1dmGT3rVqM +beVWWLy8EAiq9re07AF8sTERy9oIYF5EUq9f0xO53mwwqIWV77O9mF99/kDFGQuQ +NOnICMSHXNtMXEXzfBaMighw0uyCh1o/VCejNQ5x/HU8aLh930g5DIcOJQ3fZ4v9 +8kBaie7+aPgRMVDM1vIrILfedq9Kt56zvPizkXhDeqxjKyIZdrdoBlX5zAfftWtY +HpQ+lkThSSXqQnchN6S2JFejmRtsNnceDVOBBdvlzmH0NlfwjynLK3/EJooTsINy +i9dXD8/Oe8r+UA+nokWvnWC2IAUJjpxW+XAyTG/NofGwX+PwquT0YD5cSlODIwZA +WAimygWLqQIDAQABo1MwUTAdBgNVHQ4EFgQUsKyJAwR9OXWEcSZMQz73GfpxCJIw +HwYDVR0jBBgwFoAUsKyJAwR9OXWEcSZMQz73GfpxCJIwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQsFAAOCAQEAYKFGX7J3Fc/T9s278w61E2dSsY4DS/mjSDik +fMWvod6eKw0fE3wJOnkWxjEH3VywTY6CmHd/oiJOaD8lr/Vk+BJfYNVBaVNmguyg +4LXoWz9Benx0bAIeuDbNAhOvA4H4aIz8UrD9lKFvKdRp42gPMLtMEbzbLcBdT95D +6BX7EhYm7vTnpitLPgFxVCsJ1JFqv2AQfUm+IkqQkezPs5x0tWLyrvCDNRGJ0kfv +UuowpUZXDOh3k1vB+xaSOFviieLaCW8TSdd5FZgI2HQj4e6vCKsMGuKKZXrMUTI/ +qtrFlUfsOuwourfC5LMHtCyYo5B3uvAWT1eTXxhrGqyleSlxJQ== -----END CERTIFICATE----- diff --git a/plugins/tests/certs/expired-key.pem b/plugins/tests/certs/expired-key.pem index c1510b2..c5bba56 100644 --- a/plugins/tests/certs/expired-key.pem +++ b/plugins/tests/certs/expired-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJ4crAoWMlZRdg -cqyKzKlR/10eUg9AAhLIY/UFfpQvbpku8TqQpvHcsVD1bY84ahBaXMWIHWygZ5VY -N3RTQm1Z0IqY5dZ1xem6lCVNJS1EIwNCR+os3wZHlMFN3vet7OnmbPTycx8vC7Sn -lVDX3VSLwkcWCsA5qUCfxTDkN7y+PhWZNeZTk0nZQWgLR11T9OH+XBEJrIdzVycx -WrYXtz+6ExRRBg0GYnLSnGgdrCn6P00qX/EhiyOBA2BqFDI26zC4YeNoTCE+77sb -Tdexbh6G74fXz3wz8yRKWfotABTWzKgnzKk8zy1X7ODHi7CPu52dnaFx433m5bvQ -9aDkNDJTAgMBAAECggEACrLFfNnQmD24NGs/S4e2/VpsA9xTZI/3kNkDNgxULANP -aNZtxRajwI9A/BCXQ2UTgsZhzWnJxOJYXrlpl7PweY78mUesysb3MOUC6QisUm0M -kimfdktHWOnAKLFFLNleN9DUVjjVkTeslijqhNX80f80py1grG2UuCLKCX4OqYIm -qACE8TMmSZLz42AO96TndNtKplQ8LuGLEmByW95wEfhx3Gm4ckkL7qII/U3DnQXr -0T+3xLaj+eNJzYDpIFZiw4sNzOuAyCz+4Cc4sPDuMnzquXF+enpkemoycC1RmEpG -KIDTwmFsc8TrbGV0qifC6fsCrDivdYLqL7R/q3IBQQKBgQDmfvO3VYTEKY8NA+AT -5s6+7NTxRsXxJUCEhCNBWimSH3EzmBAvrodLY6A0oYg8i81bgNX1I9GPVXJZ/QA7 -ukd84HUIQoGS5Usmo4rp+kz4P6KkLXDemZtWPU5GXxicfajHRQlkbW6St6SpV7IS -ibJcDADeoiaPL1xvue1ToP/LoQKBgQDgOFHjYpep00gabvjXfYW7vhrg1vVwaKUM -rf0+UW8Exk4nbBw0eEC2YjxIwzdktlkdbzGaXYULnhg8GnfxYesMOpCLPw1JdB8o -ixETAFpW5bKrUsjEFRUGhzWnsCSFIQ4smpmtGLTxOQ8AkoDdORY5Z+Wv7JtFF6Do -PSoblckZcwKBgB3TD3YJesRnHDty5OuuUdIikuslXTd2uoJrFqS+JeLibqNeabnB -u3/lxDULMbWj4U6VvRmbKOKDC+jY887Gq7lc0cff0yROxwqY3sCnwo3crg7QUmp7 -Nb5S8G3qoCSfndcq96wm/Me/O28uCbycVJfUdchY8uRUHIHYbP0FOBQBAoGBAMgh -fPX4imaKr1DovDObVkK87EDDnU84GBm5MtDs3qrkVd3aIVK0Aw7HoAdSN58tI12i -YiPmVVqJQhhjh6tsOuAvZdTj8ngdrbICbrsHFZt6an+A5LIgHyQ0iy+hiPdLCdvG -ImTeKKMmyr04Bs1upueWVO0xw2VoMbcY4Py+NUEBAoGASQqedfCSKGLT+5lLZrhP -CbFVMmswEPjBcRb1trcuA09vfExn9FfUNFnnw3i9miprED5kufvAjb+6nduXizKg -7HQYHCwVvakgtXgbiDMaNgYZcjWm+MdnfiwLJjJTO3DfI1JF2PJ8y9R95DPlAkDm -xH3OV8KV4UiTEVxS7ksmGzY= +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDCDV2YZPetWoxt +5VZYvLwQCKr2t7TsAXyxMRHL2ghgXkRSr1/TE7nebDCohZXvs72YX33+QMUZC5A0 +6cgIxIdc20xcRfN8FoyKCHDS7IKHWj9UJ6M1DnH8dTxouH3fSDkMhw4lDd9ni/3y +QFqJ7v5o+BExUMzW8isgt952r0q3nrO8+LOReEN6rGMrIhl2t2gGVfnMB9+1a1ge +lD6WROFJJepCdyE3pLYkV6OZG2w2dx4NU4EF2+XOYfQ2V/CPKcsrf8QmihOwg3KL +11cPz857yv5QD6eiRa+dYLYgBQmOnFb5cDJMb82h8bBf4/Cq5PRgPlxKU4MjBkBY +CKbKBYupAgMBAAECggEBAJ2mdCKJ7LoWdT4W8pZ3BqZUFGkKCF8wOhhOUDH3+ZQp +IYK3XbdDMF7mMIXIuW4a7W4sLlTwU/Ar98U1JMESwRIMS7YvUke+ngDKKLcDVGwY +Qpjg9vP0v2Al8qT1NbW/nDF0S2aJJbWfAvnblHK5ClFHL9iL107NQYJ8PqzXbnFL +gCQRiZxVHlrbn/73ZUMHPGEoU0711U9hSjrsqrRuSAMC+V38s4HxOomZWutlVAHF +HwClNZBqRO+a2njPyUuV9DM/rl5Tm9IQ89iFo3/QEORICK77HjJYhi+UzdfI5F35 +UntRJt+WLaiAP+K6Vt6oxHSm58qXnOkeLzaAunTTie0CgYEA6OLYfme8xe5zYXWX +rqmKNYdcVfMkvL+vUfVT475o/piRtE54JC1LYWEFAN8paxEWHD5HZMy0+ONNXfGm +zyNNTN/Lagz4WcpdFzKQmhfdro7DzRiDfdvwSLmaZDyE41PPPVVvfrI9IeDiUNY4 +nWLSb3sWo96Iuns+RoMqeA9wkqsCgYEA1U/UqeVQVTPlrWyiB2VXoI1xvFCCJTf8 +4NC0gcisxLRrtINk0BwrUJrRy0x1OLpJWiKwUl/W1GgvPPfhbYcUOb669JNtTIjY +FeIZblCTjz9GzKKmXeDciXvccyEdCJVUlPO3/e2JiJ4mCDjULprifq0a2gcQevFS +PfqVULhBOvsCgYB5KfS7J1vGmv36ucSWAe0/VlKLATqe3RfpCzt/JQTZWSWNaroF +EG/ElUaWIoUZCEW5oglg/0Q0rYYGF4DTCingkhrx7ReVF70BIbSsBzi15d8nKNbY +t4I3RCF4fyggYe1TmsysXS2DH85/gkToVY7oo2CvF0uJwi8vXnTNDDNkiwKBgHKs +mAc94BHt9GtnGzQepx0I7TvvjAe2MZwqlt+uojKdS8mfWXMHscGDeYVxdRMqEoUC +YQfnvfYyjDKaj/XxyE3C237gQsICTyh0hHdpmepIeidIyWdumyDOFZVPF+ylWvM4 +kpFQQb/QRWHmKyti2KCBLw5G/fUaBryLGfprE6ZBAoGBANy5rr41A679UQZ0abev +bOZb7YWOHYp/wReJaQbvLAyR30os3aEY/0ht9S+OWdrgGMezPKvsx2Sqr/CwoFXI +esiklpknr11maEPxnQJYi4FYiXS1a3NCg7yBvKzFEgx2XnMAC3s6zhuZXaFq4zNu +pm5Btrq/NZqtVXovS+UhGLvJ -----END PRIVATE KEY----- diff --git a/plugins/tests/certs/ext.cnf b/plugins/tests/certs/ext.cnf new file mode 100644 index 0000000..d09cee1 --- /dev/null +++ b/plugins/tests/certs/ext.cnf @@ -0,0 +1,2 @@ +[ client_ca ] +basicConstraints = critical, CA:true diff --git a/plugins/tests/certs/generate-certs.sh b/plugins/tests/certs/generate-certs.sh new file mode 100755 index 0000000..78660a2 --- /dev/null +++ b/plugins/tests/certs/generate-certs.sh @@ -0,0 +1,63 @@ +#!/bin/sh -e +# +# Recreates the https server certificates +# +# Set the GEN_EXPIRED environment variable to also regenerate +# the expired certificate. + +cd "$(dirname "$0")" +trap 'rm -f *.csr; rm -f clientca-cert.srl' EXIT + +subj() { + c="DE" + st="Bavaria" + l="Munich" + o="Monitoring Plugins" + cn="Monitoring Plugins" + emailAddress="devel@monitoring-plugins.org" + + if [ -n "$1" ]; then + # Add to CN + cn="$cn $1" + fi + + printf "/C=%s/ST=%s/L=%s/O=%s/CN=%s/emailAddress=%s" \ + "$c" "$st" "$l" "$o" "$cn" "$emailAddress" +} + +# server +openssl req -new -x509 -days 3560 -nodes \ + -keyout server-key.pem -out server-cert.pem \ + -subj "$(subj)" +# server, expired +# there is generally no need to regenerate this, as it will stay epxired +[ -n "$GEN_EXPIRED" ] && TZ=UTC faketime -f '2008-01-01 12:00:00' \ + openssl req -new -x509 -days 1 -nodes \ + -keyout expired-key.pem -out expired-cert.pem \ + -subj "$(subj)" + +# client, ca +openssl req -new -x509 -days 3560 -nodes \ + -keyout clientca-key.pem -out clientca-cert.pem \ + -subj "$(subj ClientCA)" +echo "01" >clientca-cert.srl +# client +openssl req -new -nodes \ + -keyout client-key.pem -out client-cert.csr \ + -subj "$(subj Client)" +openssl x509 -days 3560 -req -CA clientca-cert.pem -CAkey clientca-key.pem \ + -in client-cert.csr -out client-cert.pem +# client, intermediate +openssl req -new -nodes \ + -keyout clientintermediate-key.pem -out clientintermediate-cert.csr \ + -subj "$(subj ClientIntermediate)" +openssl x509 -days 3560 -req -CA clientca-cert.pem -CAkey clientca-key.pem \ + -extfile ext.cnf -extensions client_ca \ + -in clientintermediate-cert.csr -out clientintermediate-cert.pem +# client, chain +openssl req -new -nodes \ + -keyout clientchain-key.pem -out clientchain-cert.csr \ + -subj "$(subj ClientChain)" +openssl x509 -days 3560 -req -CA clientca-cert.pem -CAkey clientca-key.pem \ + -in clientchain-cert.csr -out clientchain-cert.pem +cat clientintermediate-cert.pem >>clientchain-cert.pem diff --git a/plugins/tests/certs/server-cert.pem b/plugins/tests/certs/server-cert.pem index b84b91d..d1249ef 100644 --- a/plugins/tests/certs/server-cert.pem +++ b/plugins/tests/certs/server-cert.pem @@ -1,24 +1,24 @@ -----BEGIN CERTIFICATE----- -MIIEBjCCAu6gAwIBAgIJANbQ5QQrKhUGMA0GCSqGSIb3DQEBCwUAMIGXMQswCQYD -VQQGEwJERTEQMA4GA1UECAwHQmF2YXJpYTEPMA0GA1UEBwwGTXVuaWNoMRswGQYD -VQQKDBJNb25pdG9yaW5nIFBsdWdpbnMxGzAZBgNVBAMMEk1vbml0b3JpbmcgUGx1 -Z2luczErMCkGCSqGSIb3DQEJARYcZGV2ZWxAbW9uaXRvcmluZy1wbHVnaW5zLm9y -ZzAeFw0xOTAyMTkxNTMxNDRaFw0yOTAyMTYxNTMxNDRaMIGXMQswCQYDVQQGEwJE -RTEQMA4GA1UECAwHQmF2YXJpYTEPMA0GA1UEBwwGTXVuaWNoMRswGQYDVQQKDBJN -b25pdG9yaW5nIFBsdWdpbnMxGzAZBgNVBAMMEk1vbml0b3JpbmcgUGx1Z2luczEr -MCkGCSqGSIb3DQEJARYcZGV2ZWxAbW9uaXRvcmluZy1wbHVnaW5zLm9yZzCCASIw -DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKgV2yp8pQvJuN+aJGdAe6Hd0tja -uteCPcNIcM92WLOF69TLTSYon1XDon4tHTh4Z5d4lD8bfsGzFVBmDSgWidhAUf+v -EqEXwbp293ej/Frc0pXCvmrz6kI1tWrLtQhL/VdbxFYxhV7JjKb+PY3SxGFpSLPe -PQ/5SwVndv7rZIwcjseL22K5Uy2TIrkgzzm2pRs/IvoxRybYr/+LGoHyrtJC6AO8 -ylp8A/etL0gwtUvRnrnZeTQ2pA1uZ5QN3anTL8JP/ZRZYNegIkaawqMtTKbhM6pi -u3/4a3Uppvt0y7vmGfQlYejxCpICnMrvHMpw8L58zv/98AbCGjDU3UwCt6MCAwEA -AaNTMFEwHQYDVR0OBBYEFG/UH6nGYPlVcM75UXzXBF5GZyrcMB8GA1UdIwQYMBaA -FG/UH6nGYPlVcM75UXzXBF5GZyrcMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN -AQELBQADggEBAGwitJPOnlIKLndNf+iCLMIs0dxsl8kAaejFcjoT0n4ja7Y6Zrqz -VSIidzz9vQWvy24xKJpAOdj/iLRHCUOG+Pf5fA6+/FiuqXr6gE2/lm0eC58BNONr -E5OzjQ/VoQ8RX4hDntgu6FYbaVa/vhwn16igt9qmdNGGZXf2/+DM3JADwyaA4EK8 -vm7KdofX9zkxXecHPNvf3jiVLPiDDt6tkGpHPEsyP/yc+RUdltUeZvHfliV0cCuC -jJX+Fm9ysjSpHIFFr+jUMuMHibWoOD8iy3eYxfCDoWsH488pCbj8MNuAq6vd6DBk -bOZxDz43vjWuYMkwXJTxJQh7Pne6kK0vE1g= +MIIEETCCAvmgAwIBAgIUZwOhY4myaCUaPek3NM+MxbLG9vwwDQYJKoZIhvcNAQEL +BQAwgZcxCzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZN +dW5pY2gxGzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEbMBkGA1UEAwwSTW9u +aXRvcmluZyBQbHVnaW5zMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5n +LXBsdWdpbnMub3JnMB4XDTIxMDIyODIxMDIxMVoXDTMwMTEyODIxMDIxMVowgZcx +CzAJBgNVBAYTAkRFMRAwDgYDVQQIDAdCYXZhcmlhMQ8wDQYDVQQHDAZNdW5pY2gx +GzAZBgNVBAoMEk1vbml0b3JpbmcgUGx1Z2luczEbMBkGA1UEAwwSTW9uaXRvcmlu +ZyBQbHVnaW5zMSswKQYJKoZIhvcNAQkBFhxkZXZlbEBtb25pdG9yaW5nLXBsdWdp +bnMub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2/3eBA4WG6xz +LfM6xcWywxThb1Rp7XAW3ewQd9/PdoWXEe8BJWlLfyYi1drLMcsDywhLkKmW4Vp9 +1R4PAkiljjrB/ZaUMDLJ1ri3dwX4RvXG7crsU3QWFWCBOrf5V2FTRQ2m/H/KyB/6 +rVZANsU47HqTFSPiUm2j7P3wx/wtHeYC+qmNG7zZTjAYPYxfKiod0lytTSmb+h54 +6lxn3+VPEXZAQZlLvPnm/58JnXGrUv7B2yocf5MhKkLJOrGxH2hfwKISfaj2gpOV +m4PUVYiDzCSpq1fPvwbUxIvdO27xprx+mrGOFM6f2UCEOc35w8FSmYiR2yQTnEJK +pbSQD6t1jQIDAQABo1MwUTAdBgNVHQ4EFgQUMeYgglT2aWDlF8KEeF2376AlTGYw +HwYDVR0jBBgwFoAUMeYgglT2aWDlF8KEeF2376AlTGYwDwYDVR0TAQH/BAUwAwEB +/zANBgkqhkiG9w0BAQsFAAOCAQEAFcEg83rTJdgkp7JLYqK0j8JogSHNlDYchr/r +VxKBgQwfnjSp5A8d5+uTQ9s3QDabw8v7YeSrzYXbbjuWZ61mnl84tzOQ8LMeESnC +CBXRCxB8Ow22WsVTVJq279SGYT+cZrdsmqGVWDi1A0C5kH+XTLAioG5CZmmxemD/ +S92ZoRxGyYfg33r+3X6EMcEYtHKGxCUa3EPcPOL4dq2F3nOnyjiWPZm3786H3NY2 +nsYwrEhAdUFtbYSsV5O0c/Zlc33fmTfh654ab35io1DtwmFo7q8J532dUE007EN0 +mIQmhdrjNJJHIftgSt0fuN5m48oLOnX7vvkz+X0WLWfVTtMr0w== -----END CERTIFICATE----- diff --git a/plugins/tests/certs/server-key.pem b/plugins/tests/certs/server-key.pem index 1194755..0de63f8 100644 --- a/plugins/tests/certs/server-key.pem +++ b/plugins/tests/certs/server-key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCoFdsqfKULybjf -miRnQHuh3dLY2rrXgj3DSHDPdlizhevUy00mKJ9Vw6J+LR04eGeXeJQ/G37BsxVQ -Zg0oFonYQFH/rxKhF8G6dvd3o/xa3NKVwr5q8+pCNbVqy7UIS/1XW8RWMYVeyYym -/j2N0sRhaUiz3j0P+UsFZ3b+62SMHI7Hi9tiuVMtkyK5IM85tqUbPyL6MUcm2K// -ixqB8q7SQugDvMpafAP3rS9IMLVL0Z652Xk0NqQNbmeUDd2p0y/CT/2UWWDXoCJG -msKjLUym4TOqYrt/+Gt1Kab7dMu75hn0JWHo8QqSApzK7xzKcPC+fM7//fAGwhow -1N1MArejAgMBAAECggEANuvdTwanTzC8jaNqHaq+OuemS2E9B8nwsGxtH/zFgvNR -WZiMPtmrJnTkFWJcV+VPw/iMSAqN4nDHmBugVOb4Z4asxGTKK4T9shXJSnh0rqPU -00ZsvbmxY6z0+E5TesCJqQ+9GYTY1V357V7JchvaOxIRxWPqg9urHbru8OCtW/I5 -Fh5HPUZlgCvlMpjlhyjydIf/oXyVA3RNsXlwe8+2cKuGIrjEzm2j9o3VF0sctTX0 -ItP8A9qDmDQN7GIWX0MW6gncojpS1omC2wcFsdjj/xfPyiDal1X4aq/2YqG8351c -YlM/+6Va0u9WWE/i64gASTAVqpMV4Yg8y0gGycuA0QKBgQDbgI2QeLd3FvMcURiU -l3w9qJgw/Jp3jaNC/9LkVGGz4f4lKKB67lPZvI4noMK8GqO/LcXgqP/RY1oJojoA -/6JKVvzYGASZ7VgMoG9bk1AneP1PGdibuTUEwimGlcObxnDFIC/yjwPFu3jIdqdS -zZi1RZzyqAogN5y3SBEypSmn9wKBgQDECKsqqlcizmCl8v5aVk875AzGN+DOHZqx -bkmztlnLO/2e2Fmk3G5Vvnui0FYisf8Eq19tUTQCF6lSfJlGQeFAT119wkFZhLu+ -FfLGqoEMH0ijJg/8PpdpFRK3I94YcISoTNN6yxMvE6xdDGfKCt5a+IX5bwQi9Zdc -B242gEc6tQKBgA6tM8n7KFlAIZU9HuWgk2AUC8kKutFPmSD7tgAqXDYI4FNfugs+ -MEEYyHCB4UNujJBV4Ss6YZCAkh6eyD4U2aca1eElCfm40vBVMdzvpqZdAqLtWXxg -D9l3mgszrFaYGCY2Fr6jLV9lP5g3xsxUjudf9jSLY9HvpfzjRrMaNATVAoGBALTl -/vYfPMucwKlC5B7++J0e4/7iv6vUu9SyHocdZh1anb9AjPDKjXLIlZT4RhQ8R0XK -0wOw5JpttU2uN08TKkbLNk3/vYhbKVjPLjrQSseh8sjDLgsqw1QwIxYnniLVakVY -p+rvjSNrNyqicQCMKQavwgocvSd5lJRTMwxOMezlAoGBAKWj71BX+0CK00/2S6lC -TcNcuUPG0d8y1czZ4q6tUlG4htwq1FMOpaghATXjkdsOGTLS+H1aA0Kt7Ai9zDhc -/bzOJEJ+jvBXV4Gcs7jl1r/HTKv0tT9ZSI5Vzkida0rfqxDGzcMVlLuCdH0cb8Iu -N0wdmCAqlQwHR13+F1zrAD7V +MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDb/d4EDhYbrHMt +8zrFxbLDFOFvVGntcBbd7BB33892hZcR7wElaUt/JiLV2ssxywPLCEuQqZbhWn3V +Hg8CSKWOOsH9lpQwMsnWuLd3BfhG9cbtyuxTdBYVYIE6t/lXYVNFDab8f8rIH/qt +VkA2xTjsepMVI+JSbaPs/fDH/C0d5gL6qY0bvNlOMBg9jF8qKh3SXK1NKZv6Hnjq +XGff5U8RdkBBmUu8+eb/nwmdcatS/sHbKhx/kyEqQsk6sbEfaF/AohJ9qPaCk5Wb +g9RViIPMJKmrV8+/BtTEi907bvGmvH6asY4Uzp/ZQIQ5zfnDwVKZiJHbJBOcQkql +tJAPq3WNAgMBAAECggEBAIvJDUjQVpXxByL8eazviT5SR0jBf6mC3tTWykQRb7ck +/bBEiRrnhDRf3CS9KP4TvO5G8BUU3a2GHYzM08akuKXeiiODidfyfbQ1nUZBAdi9 +FVFF7tK8YcflkVfpTMOMMSggm6m33fc58sQvmQ/0U85XuJvnOEkeJ9pQJa49e8GR +lpCQImF7ygltHPEz4o8qOtNMuPxiHOxpc517+ozQULZk153NTfGok1XctDFFZ3YX +8okLSfcqZ28mdHYSvI9xf60Cm7cT9tunXHwZ0f1esTFiVYpAp+oTJqtdYxr/fYlL +oO8G8iIQ7LjdJfgo84PscpKdSRCq3BfnmER1Eyg6hrUCgYEA/0hL5Y/haz/2jYGy +aa8yZSuD1ZcWtj7pLKrBQnHPHIHsjSBggWhopvonCFvCjgSS1pOFOUAwMGc0T+Dw +rWo3w8cEUyECl3Bw8gbCWtRXaigzU9TPgCWyx1j5dTopQhLObzS/m7fJFElnYNru +jqhsUfWS+NKk8a5+A7i9lv4iBLMCgYEA3Jws3Lfj/Xs7LljrvryTMpPthvUGBcyt +U9Qmf1Hmur90RP5V1rx4FqPQzIeaGQyZDNIUnkhBSqQZNCts3Rzay7N4uQzk8OEg +S8Llnw76wLwi0SJ4okDtT5tpTR6fcS0M9lGN+zvvfUB4+ul8oub0pMcyme/pywEz +ap+x3xAQPL8CgYEAiYOBVtTNof9fqdRurh1w8SyipKDx3BRBeQ02c7tozLt0GIWT +VsJOdXwVIJyFTglKrAnlXvSjwL8nX8wU+eVYyr5fJwSGJ9urC8T2VwVBXW7wTz04 +1Zf5GQdlwW8mIHCPATqR6Kj0yVfNN1BX50L0rqWxmRWnQoUzXn/aqQaWfp8CgYAW +9693/zEeR8EejyVkAy/z+RCml0XcPrXg31pusPErihkpwazgIVkDSmTHlmqFpxkc +C5cX73/UrIbvNoIr9wAUawfrhBsltNpu6MiNKbsTa8LYMRWMFuReAFkTLVf+KWmL +D2yPtmq1iIvP25UdRJw9t3teKWsWtnZK6HtVNM/r8wKBgQDKlqUpy8r4KK+S2w80 +H7rAQJo1DgXsYrgSa2gfppSKro4lm3ltyAfVIrKQKP7uCo9xTGKVQAUPttMs2+17 +nwbwvt7/nG7G1Dk/C/t6b7SJ80VY5b9ZZKIJ0wOjajLufSjPNCe0ZTRn32XusZUn +nYGB5/QXYr5WGV9YhAkRsFJYgA== -----END PRIVATE KEY----- diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t index 0caad23..aa72ef6 100755 --- a/plugins/tests/check_curl.t +++ b/plugins/tests/check_curl.t @@ -126,8 +126,6 @@ if ($pid) { exit; } } - # give our webservers some time to startup - sleep(1); } else { # Child #print "child\n"; @@ -140,6 +138,9 @@ if ($pid) { exit; } +# give our webservers some time to startup +sleep(3); + # Run the same server on http and https sub run_server { my $d = shift; @@ -227,23 +228,25 @@ SKIP: { skip "HTTP::Daemon::SSL not installed", $common_tests + $ssl_only_tests if ! exists $servers->{https}; run_common_tests( { command => "$command -p $port_https", ssl => 1 } ); + my $expiry = "Thu Nov 28 21:02:11 2030 +0000"; + $result = NPTest->testCmd( "$command -p $port_https -S -C 14" ); is( $result->return_code, 0, "$command -p $port_https -S -C 14" ); - is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on Fri Feb 16 15:31:44 2029 +0000.", "output ok" ); + is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on $expiry.", "output ok" ); $result = NPTest->testCmd( "$command -p $port_https -S -C 14000" ); is( $result->return_code, 1, "$command -p $port_https -S -C 14000" ); - like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(Fri Feb 16 15:31:44 2029 \+0000\)./', "output ok" ); + like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" ); # Expired cert tests $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" ); is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" ); - like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(Fri Feb 16 15:31:44 2029 \+0000\)./', "output ok" ); + like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" ); $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" ); is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" ); is( $result->output, - 'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan 2 11:00:26 2008 +0000.', + 'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan 2 12:00:00 2008 +0000.', "output ok" ); } diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index 2f051fa..ea11b2a 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t @@ -3,16 +3,7 @@ # Test check_http by having an actual HTTP server running # # To create the https server certificate: -# openssl req -new -x509 -keyout server-key.pem -out server-cert.pem -days 3650 -nodes -# to create a new expired certificate: -# faketime '2008-01-01 12:00:00' openssl req -new -x509 -keyout expired-key.pem -out expired-cert.pem -days 1 -nodes -# Country Name (2 letter code) [AU]:DE -# State or Province Name (full name) [Some-State]:Bavaria -# Locality Name (eg, city) []:Munich -# Organization Name (eg, company) [Internet Widgits Pty Ltd]:Monitoring Plugins -# Organizational Unit Name (eg, section) []: -# Common Name (e.g. server FQDN or YOUR name) []:Monitoring Plugins -# Email Address []:devel@monitoring-plugins.org +# ./certs/generate-certs.sh use strict; use Test::More; @@ -23,7 +14,7 @@ $ENV{'LC_TIME'} = "C"; my $common_tests = 70; my $virtual_port_tests = 8; -my $ssl_only_tests = 8; +my $ssl_only_tests = 12; # Check that all dependent modules are available eval "use HTTP::Daemon 6.01;"; plan skip_all => 'HTTP::Daemon >= 6.01 required' if $@; @@ -59,120 +50,151 @@ $HTTP::Daemon::VERSION = "1.00"; my $port_http = 50000 + int(rand(1000)); my $port_https = $port_http + 1; my $port_https_expired = $port_http + 2; +my $port_https_clientcert = $port_http + 3; # This array keeps sockets around for implementing timeouts my @persist; # Start up all servers my @pids; -my $pid = fork(); -if ($pid) { - # Parent - push @pids, $pid; - if (exists $servers->{https}) { - # Fork a normal HTTPS server - $pid = fork(); - if ($pid) { - # Parent - push @pids, $pid; - # Fork an expired cert server - $pid = fork(); - if ($pid) { - push @pids, $pid; - } else { - my $d = HTTP::Daemon::SSL->new( - LocalPort => $port_https_expired, - LocalAddr => "127.0.0.1", - SSL_cert_file => "$Bin/certs/expired-cert.pem", - SSL_key_file => "$Bin/certs/expired-key.pem", - ) || die; - print "Please contact https expired at: url, ">\n"; - run_server( $d ); - exit; - } - } else { - my $d = HTTP::Daemon::SSL->new( - LocalPort => $port_https, - LocalAddr => "127.0.0.1", - SSL_cert_file => "$Bin/certs/server-cert.pem", - SSL_key_file => "$Bin/certs/server-key.pem", - ) || die; - print "Please contact https at: url, ">\n"; - run_server( $d ); - exit; - } - } - # give our webservers some time to startup - sleep(1); -} else { - # Child - #print "child\n"; +# Fork a HTTP server +my $pid = fork; +defined $pid or die "Failed to fork"; +if (!$pid) { + undef @pids; my $d = HTTP::Daemon->new( LocalPort => $port_http, LocalAddr => "127.0.0.1", ) || die; print "Please contact http at: url, ">\n"; run_server( $d ); - exit; + die "webserver stopped"; } +push @pids, $pid; + +if (exists $servers->{https}) { + # Fork a normal HTTPS server + $pid = fork; + defined $pid or die "Failed to fork"; + if (!$pid) { + undef @pids; + # closing the connection after -C cert checks make the daemon exit with a sigpipe otherwise + local $SIG{'PIPE'} = 'IGNORE'; + my $d = HTTP::Daemon::SSL->new( + LocalPort => $port_https, + LocalAddr => "127.0.0.1", + SSL_cert_file => "$Bin/certs/server-cert.pem", + SSL_key_file => "$Bin/certs/server-key.pem", + ) || die; + print "Please contact https at: url, ">\n"; + run_server( $d ); + die "webserver stopped"; + } + push @pids, $pid; + + # Fork an expired cert server + $pid = fork; + defined $pid or die "Failed to fork"; + if (!$pid) { + undef @pids; + # closing the connection after -C cert checks make the daemon exit with a sigpipe otherwise + local $SIG{'PIPE'} = 'IGNORE'; + my $d = HTTP::Daemon::SSL->new( + LocalPort => $port_https_expired, + LocalAddr => "127.0.0.1", + SSL_cert_file => "$Bin/certs/expired-cert.pem", + SSL_key_file => "$Bin/certs/expired-key.pem", + ) || die; + print "Please contact https expired at: url, ">\n"; + run_server( $d ); + die "webserver stopped"; + } + push @pids, $pid; + + # Fork an client cert expecting server + $pid = fork; + defined $pid or die "Failed to fork"; + if (!$pid) { + undef @pids; + # closing the connection after -C cert checks make the daemon exit with a sigpipe otherwise + local $SIG{'PIPE'} = 'IGNORE'; + my $d = HTTP::Daemon::SSL->new( + LocalPort => $port_https_clientcert, + LocalAddr => "127.0.0.1", + SSL_cert_file => "$Bin/certs/server-cert.pem", + SSL_key_file => "$Bin/certs/server-key.pem", + SSL_verify_mode => IO::Socket::SSL->SSL_VERIFY_PEER | IO::Socket::SSL->SSL_VERIFY_FAIL_IF_NO_PEER_CERT, + SSL_ca_file => "$Bin/certs/clientca-cert.pem", + ) || die; + print "Please contact https client cert at: url, ">\n"; + run_server( $d ); + die "webserver stopped"; + } + push @pids, $pid; +} + +# give our webservers some time to startup +sleep(3); # Run the same server on http and https sub run_server { my $d = shift; - MAINLOOP: while (my $c = $d->accept ) { - while (my $r = $c->get_request) { - if ($r->method eq "GET" and $r->url->path =~ m^/statuscode/(\d+)^) { - $c->send_basic_header($1); - $c->send_crlf; - } elsif ($r->method eq "GET" and $r->url->path =~ m^/file/(.*)^) { - $c->send_basic_header; - $c->send_crlf; - $c->send_file_response("$Bin/var/$1"); - } elsif ($r->method eq "GET" and $r->url->path eq "/slow") { - $c->send_basic_header; - $c->send_crlf; - sleep 1; - $c->send_response("slow"); - } elsif ($r->url->path eq "/method") { - if ($r->method eq "DELETE") { - $c->send_error(HTTP::Status->RC_METHOD_NOT_ALLOWED); - } elsif ($r->method eq "foo") { - $c->send_error(HTTP::Status->RC_NOT_IMPLEMENTED); + while (1) { + MAINLOOP: while (my $c = $d->accept) { + while (my $r = $c->get_request) { + if ($r->method eq "GET" and $r->url->path =~ m^/statuscode/(\d+)^) { + $c->send_basic_header($1); + $c->send_crlf; + } elsif ($r->method eq "GET" and $r->url->path =~ m^/file/(.*)^) { + $c->send_basic_header; + $c->send_crlf; + $c->send_file_response("$Bin/var/$1"); + } elsif ($r->method eq "GET" and $r->url->path eq "/slow") { + $c->send_basic_header; + $c->send_crlf; + sleep 1; + $c->send_response("slow"); + } elsif ($r->url->path eq "/method") { + if ($r->method eq "DELETE") { + $c->send_error(HTTP::Status->RC_METHOD_NOT_ALLOWED); + } elsif ($r->method eq "foo") { + $c->send_error(HTTP::Status->RC_NOT_IMPLEMENTED); + } else { + $c->send_status_line(200, $r->method); + } + } elsif ($r->url->path eq "/postdata") { + $c->send_basic_header; + $c->send_crlf; + $c->send_response($r->method.":".$r->content); + } elsif ($r->url->path eq "/redirect") { + $c->send_redirect( "/redirect2" ); + } elsif ($r->url->path eq "/redir_external") { + $c->send_redirect(($d->isa('HTTP::Daemon::SSL') ? "https" : "http") . "://169.254.169.254/redirect2" ); + } elsif ($r->url->path eq "/redirect2") { + $c->send_basic_header; + $c->send_crlf; + $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' )); + } elsif ($r->url->path eq "/redir_timeout") { + $c->send_redirect( "/timeout" ); + } elsif ($r->url->path eq "/timeout") { + # Keep $c from being destroyed, but prevent severe leaks + unshift @persist, $c; + delete($persist[1000]); + next MAINLOOP; + } elsif ($r->url->path eq "/header_check") { + $c->send_basic_header; + $c->send_header('foo'); + $c->send_crlf; + } elsif ($r->url->path eq "/virtual_port") { + # return sent Host header + $c->send_basic_header; + $c->send_crlf; + $c->send_response(HTTP::Response->new( 200, 'OK', undef, $r->header ('Host'))); } else { - $c->send_status_line(200, $r->method); + $c->send_error(HTTP::Status->RC_FORBIDDEN); } - } elsif ($r->url->path eq "/postdata") { - $c->send_basic_header; - $c->send_crlf; - $c->send_response($r->method.":".$r->content); - } elsif ($r->url->path eq "/redirect") { - $c->send_redirect( "/redirect2" ); - } elsif ($r->url->path eq "/redir_external") { - $c->send_redirect(($d->isa('HTTP::Daemon::SSL') ? "https" : "http") . "://169.254.169.254/redirect2" ); - } elsif ($r->url->path eq "/redirect2") { - $c->send_basic_header; - $c->send_crlf; - $c->send_response(HTTP::Response->new( 200, 'OK', undef, 'redirected' )); - } elsif ($r->url->path eq "/redir_timeout") { - $c->send_redirect( "/timeout" ); - } elsif ($r->url->path eq "/timeout") { - # Keep $c from being destroyed, but prevent severe leaks - unshift @persist, $c; - delete($persist[1000]); - next MAINLOOP; - } elsif ($r->url->path eq "/header_check") { - $c->send_basic_header; - $c->send_header('foo'); - $c->send_crlf; - } elsif ($r->url->path eq "/virtual_port") { - # return sent Host header - $c->send_basic_header; - $c->send_crlf; - $c->send_response(HTTP::Response->new( 200, 'OK', undef, $r->header ('Host'))); - } else { - $c->send_error(HTTP::Status->RC_FORBIDDEN); + $c->close; } - $c->close; } } } @@ -197,25 +219,44 @@ SKIP: { skip "HTTP::Daemon::SSL not installed", $common_tests + $ssl_only_tests if ! exists $servers->{https}; run_common_tests( { command => "$command -p $port_https", ssl => 1 } ); + my $expiry = "Thu Nov 28 21:02:11 2030 +0000"; + $result = NPTest->testCmd( "$command -p $port_https -S -C 14" ); is( $result->return_code, 0, "$command -p $port_https -S -C 14" ); - is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on Fri Feb 16 15:31:44 2029 +0000.", "output ok" ); + is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on $expiry.", "output ok" ); $result = NPTest->testCmd( "$command -p $port_https -S -C 14000" ); is( $result->return_code, 1, "$command -p $port_https -S -C 14000" ); - like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(Fri Feb 16 15:31:44 2029 \+0000\)./', "output ok" ); + like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" ); # Expired cert tests $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" ); is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" ); - like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(Fri Feb 16 15:31:44 2029 \+0000\)./', "output ok" ); + like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" ); $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" ); is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" ); is( $result->output, - 'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan 2 11:00:26 2008 +0000.', + 'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan 2 12:00:00 2008 +0000.', "output ok" ); + # client cert tests + my $cmd; + $cmd = "$command -p $port_https_clientcert" + . " -J \"$Bin/certs/client-cert.pem\"" + . " -K \"$Bin/certs/client-key.pem\"" + . " -u /statuscode/200"; + $result = NPTest->testCmd($cmd); + is( $result->return_code, 0, $cmd); + like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); + + $cmd = "$command -p $port_https_clientcert" + . " -J \"$Bin/certs/clientchain-cert.pem\"" + . " -K \"$Bin/certs/clientchain-key.pem\"" + . " -u /statuscode/200"; + $result = NPTest->testCmd($cmd); + is( $result->return_code, 0, $cmd); + like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output ); } my $cmd; @@ -414,22 +455,24 @@ sub run_common_tests { # stickyport - on full urlS port is set back to 80 otherwise $cmd = "$command -f stickyport -u /redir_external -t 5 -s redirected"; + alarm(2); eval { local $SIG{ALRM} = sub { die "alarm\n" }; - alarm(2); $result = NPTest->testCmd( $cmd ); - alarm(0); }; + }; isnt( $@, "alarm\n", $cmd ); + alarm(0); is( $result->return_code, 0, $cmd ); # Let's hope there won't be any web server on :80 returning "redirected"! $cmd = "$command -f sticky -u /redir_external -t 5 -s redirected"; + alarm(2); eval { local $SIG{ALRM} = sub { die "alarm\n" }; - alarm(2); $result = NPTest->testCmd( $cmd ); - alarm(0); }; + }; isnt( $@, "alarm\n", $cmd ); + alarm(0); isnt( $result->return_code, 0, $cmd ); # Test an external address - timeout diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t index 54d43d9..3af218f 100755 --- a/plugins/tests/check_procs.t +++ b/plugins/tests/check_procs.t @@ -8,13 +8,14 @@ use Test::More; use NPTest; if (-x "./check_procs") { - plan tests => 50; + plan tests => 52; } else { plan skip_all => "No check_procs compiled"; } my $result; -my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin"; +my $command = "./check_procs --input-file=tests/var/ps-axwo.darwin"; +my $cmd_etime = "./check_procs --input-file=tests/var/ps-axwo.debian"; $result = NPTest->testCmd( "$command" ); is( $result->return_code, 0, "Run with no options" ); @@ -69,9 +70,21 @@ SKIP: { like( $result->output, '/^PROCS OK: 0 processes with UID = -2 \(nobody\), args \'UsB\'/', "Output correct" ); }; -$result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" ); -is( $result->return_code, 0, "Checking regexp search of arguments" ); -is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" ); +SKIP: { + skip 'check_procs is compiled with etime format support', 2 if `$command -vvv` =~ m/etime/mx; + + $result = NPTest->testCmd( "$command --ereg-argument-array='mdworker.*501'" ); + is( $result->return_code, 0, "Checking regexp search of arguments" ); + is( $result->output, "PROCS OK: 1 process with regex args 'mdworker.*501' | procs=1;;;0;", "Output correct" ); +} + +SKIP: { + skip 'check_procs is compiled without etime format support', 2 if `$cmd_etime -vvv` !~ m/etime/mx; + + $result = NPTest->testCmd( "$cmd_etime -m ELAPSED -C apache2 -w 1000 -c 2000" ); + is( $result->return_code, 2, "Checking elapsed time threshold" ); + is( $result->output, "ELAPSED CRITICAL: 10 crit, 0 warn out of 10 processes with command name 'apache2' | procs=10;;;0; procs_warn=0;;;0; procs_crit=10;;;0;", "Output correct" ); +} $result = NPTest->testCmd( "$command --vsz 1000000" ); is( $result->return_code, 0, "Checking filter by VSZ" ); @@ -83,7 +96,7 @@ is( $result->output, 'PROCS OK: 3 processes with RSS >= 100000 | procs=3;;;0;', $result = NPTest->testCmd( "$command -s S" ); is( $result->return_code, 0, "Checking filter for sleeping processes" ); -like( $result->output, '/^PROCS OK: 44 processes with STATE = S/', "Output correct" ); +like( $result->output, '/^PROCS OK: 88 processes with STATE = S/', "Output correct" ); $result = NPTest->testCmd( "$command -s Z" ); is( $result->return_code, 0, "Checking filter for zombies" ); @@ -129,4 +142,3 @@ is( $result->output, 'RSS CRITICAL: 5 crit, 0 warn out of 95 processes [WindowSe $result = NPTest->testCmd( "$command --ereg-argument-array='(nosuchname|nosuch2name)'" ); is( $result->return_code, 0, "Checking no pipe symbol in output" ); is( $result->output, "PROCS OK: 0 processes with regex args '(nosuchname,nosuch2name)' | procs=0;;;0;", "Output correct" ); - diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t index 85d6bf5..0a77fa8 100755 --- a/plugins/tests/check_snmp.t +++ b/plugins/tests/check_snmp.t @@ -9,7 +9,7 @@ use NPTest; use FindBin qw($Bin); use POSIX qw/strftime/; -my $tests = 67; +my $tests = 73; # Check that all dependent modules are available eval { require NetSNMP::OID; @@ -251,9 +251,20 @@ is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4;-2:;-3: $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c '~:-6.5'" ); is($res->return_code, 0, "Negative float OK" ); -is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;~:-6.5 ', "Negative float OK output" ); +is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;@-6.5:~ ', "Negative float OK output" ); $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w '~:-6.65' -c '~:-6.55'" ); is($res->return_code, 1, "Negative float WARNING" ); -is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;~:-6.65;~:-6.55 ', "Negative float WARNING output" ); +is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;@-6.65:~;@-6.55:~ ', "Negative float WARNING output" ); +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-10:20' -c '2:200000,-20:30'" ); +is($res->return_code, 0, "Multiple OIDs with thresholds" ); +like($res->output, '/SNMP OK - \d+ -4 | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-1:2' -c '2:200000,-20:30'" ); +is($res->return_code, 1, "Multiple OIDs with thresholds" ); +like($res->output, '/SNMP WARNING - \d+ \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" ); + +$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w 1,2 -c 1" ); +is($res->return_code, 2, "Multiple OIDs with some thresholds" ); +like($res->output, '/SNMP CRITICAL - \*\d+\* \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1;2 iso.3.6.1.4.1.8072.3.2.67.17=-4;;/', "Multiple OIDs with thresholds output" ); diff --git a/plugins/tests/var/ps-axwo.debian b/plugins/tests/var/ps-axwo.debian new file mode 100644 index 0000000..5889e9a --- /dev/null +++ b/plugins/tests/var/ps-axwo.debian @@ -0,0 +1,219 @@ +STAT UID PID PPID VSZ RSS %CPU ELAPSED COMMAND COMMAND +Ss 0 1 0 167244 7144 0.1 26-03:07:26 systemd /lib/systemd/systemd --system --deserialize 17 +S 0 2 0 0 0 0.0 26-03:07:26 kthreadd [kthreadd] +I< 0 3 2 0 0 0.0 26-03:07:26 rcu_gp [rcu_gp] +I< 0 4 2 0 0 0.0 26-03:07:26 rcu_par_gp [rcu_par_gp] +I< 0 6 2 0 0 0.0 26-03:07:26 kworker/0:0H-ev [kworker/0:0H-events_highpri] +I< 0 9 2 0 0 0.0 26-03:07:26 mm_percpu_wq [mm_percpu_wq] +S 0 10 2 0 0 0.0 26-03:07:26 rcu_tasks_rude_ [rcu_tasks_rude_] +S 0 11 2 0 0 0.0 26-03:07:26 rcu_tasks_trace [rcu_tasks_trace] +S 0 12 2 0 0 0.0 26-03:07:26 ksoftirqd/0 [ksoftirqd/0] +I 0 13 2 0 0 0.0 26-03:07:26 rcu_sched [rcu_sched] +S 0 14 2 0 0 0.0 26-03:07:26 migration/0 [migration/0] +S 0 15 2 0 0 0.0 26-03:07:26 cpuhp/0 [cpuhp/0] +S 0 16 2 0 0 0.0 26-03:07:26 cpuhp/1 [cpuhp/1] +S 0 17 2 0 0 0.0 26-03:07:26 migration/1 [migration/1] +S 0 18 2 0 0 0.0 26-03:07:26 ksoftirqd/1 [ksoftirqd/1] +I< 0 20 2 0 0 0.0 26-03:07:26 kworker/1:0H-ev [kworker/1:0H-events_highpri] +S 0 21 2 0 0 0.0 26-03:07:26 cpuhp/2 [cpuhp/2] +S 0 22 2 0 0 0.0 26-03:07:26 migration/2 [migration/2] +S 0 23 2 0 0 0.0 26-03:07:26 ksoftirqd/2 [ksoftirqd/2] +I< 0 25 2 0 0 0.0 26-03:07:26 kworker/2:0H-ev [kworker/2:0H-events_highpri] +S 0 26 2 0 0 0.0 26-03:07:26 cpuhp/3 [cpuhp/3] +S 0 27 2 0 0 0.0 26-03:07:26 migration/3 [migration/3] +S 0 28 2 0 0 0.0 26-03:07:26 ksoftirqd/3 [ksoftirqd/3] +I< 0 30 2 0 0 0.0 26-03:07:26 kworker/3:0H-ev [kworker/3:0H-events_highpri] +S 0 35 2 0 0 0.0 26-03:07:26 kdevtmpfs [kdevtmpfs] +I< 0 36 2 0 0 0.0 26-03:07:26 netns [netns] +S 0 37 2 0 0 0.0 26-03:07:26 kauditd [kauditd] +S 0 38 2 0 0 0.0 26-03:07:26 khungtaskd [khungtaskd] +S 0 39 2 0 0 0.0 26-03:07:26 oom_reaper [oom_reaper] +I< 0 40 2 0 0 0.0 26-03:07:26 writeback [writeback] +S 0 41 2 0 0 0.0 26-03:07:26 kcompactd0 [kcompactd0] +SN 0 42 2 0 0 0.0 26-03:07:26 ksmd [ksmd] +SN 0 43 2 0 0 0.0 26-03:07:26 khugepaged [khugepaged] +I< 0 62 2 0 0 0.0 26-03:07:26 kintegrityd [kintegrityd] +I< 0 63 2 0 0 0.0 26-03:07:26 kblockd [kblockd] +I< 0 64 2 0 0 0.0 26-03:07:26 blkcg_punt_bio [blkcg_punt_bio] +I< 0 65 2 0 0 0.0 26-03:07:26 edac-poller [edac-poller] +I< 0 66 2 0 0 0.0 26-03:07:26 devfreq_wq [devfreq_wq] +I< 0 67 2 0 0 0.0 26-03:07:26 kworker/2:1H-ev [kworker/2:1H-events_highpri] +S 0 70 2 0 0 0.3 26-03:07:25 kswapd0 [kswapd0] +I< 0 71 2 0 0 0.0 26-03:07:25 kthrotld [kthrotld] +I< 0 72 2 0 0 0.0 26-03:07:25 acpi_thermal_pm [acpi_thermal_pm] +I< 0 74 2 0 0 0.0 26-03:07:25 ipv6_addrconf [ipv6_addrconf] +I< 0 80 2 0 0 0.0 26-03:07:25 kworker/3:1H-ev [kworker/3:1H-events_highpri] +I< 0 84 2 0 0 0.0 26-03:07:25 kstrp [kstrp] +I< 0 87 2 0 0 0.0 26-03:07:25 zswap-shrink [zswap-shrink] +I< 0 110 2 0 0 0.0 26-03:07:25 kworker/0:1H-ev [kworker/0:1H-events_highpri] +I< 0 141 2 0 0 0.0 26-03:07:25 ata_sff [ata_sff] +S 0 143 2 0 0 0.0 26-03:07:25 scsi_eh_0 [scsi_eh_0] +I< 0 144 2 0 0 0.0 26-03:07:25 scsi_tmf_0 [scsi_tmf_0] +S 0 145 2 0 0 0.0 26-03:07:25 scsi_eh_1 [scsi_eh_1] +I< 0 146 2 0 0 0.0 26-03:07:25 scsi_tmf_1 [scsi_tmf_1] +S 0 147 2 0 0 0.0 26-03:07:25 scsi_eh_2 [scsi_eh_2] +I< 0 148 2 0 0 0.0 26-03:07:25 scsi_tmf_2 [scsi_tmf_2] +S 0 149 2 0 0 0.0 26-03:07:25 scsi_eh_3 [scsi_eh_3] +I< 0 150 2 0 0 0.0 26-03:07:25 scsi_tmf_3 [scsi_tmf_3] +S 0 151 2 0 0 0.0 26-03:07:25 scsi_eh_4 [scsi_eh_4] +I< 0 152 2 0 0 0.0 26-03:07:25 scsi_tmf_4 [scsi_tmf_4] +S 0 153 2 0 0 0.0 26-03:07:25 scsi_eh_5 [scsi_eh_5] +I< 0 154 2 0 0 0.0 26-03:07:25 scsi_tmf_5 [scsi_tmf_5] +S 0 158 2 0 0 0.0 26-03:07:25 card0-crtc0 [card0-crtc0] +S 0 159 2 0 0 0.0 26-03:07:25 card0-crtc1 [card0-crtc1] +S 0 160 2 0 0 0.0 26-03:07:25 card0-crtc2 [card0-crtc2] +I< 0 162 2 0 0 0.0 26-03:07:25 kworker/1:1H-ev [kworker/1:1H-events_highpri] +S 0 163 2 0 0 0.0 26-03:07:25 scsi_eh_6 [scsi_eh_6] +I< 0 164 2 0 0 0.0 26-03:07:25 scsi_tmf_6 [scsi_tmf_6] +S 0 165 2 0 0 0.0 26-03:07:25 usb-storage [usb-storage] +I< 0 167 2 0 0 0.0 26-03:07:25 uas [uas] +I< 0 176 2 0 0 0.0 26-03:07:25 kdmflush [kdmflush] +I< 0 177 2 0 0 0.0 26-03:07:25 kdmflush [kdmflush] +S 0 202 2 0 0 0.0 26-03:07:24 scsi_eh_7 [scsi_eh_7] +I< 0 203 2 0 0 0.0 26-03:07:24 scsi_tmf_7 [scsi_tmf_7] +S 0 204 2 0 0 0.0 26-03:07:24 usb-storage [usb-storage] +I< 0 232 2 0 0 0.0 26-03:07:23 btrfs-worker [btrfs-worker] +I< 0 233 2 0 0 0.0 26-03:07:23 btrfs-worker-hi [btrfs-worker-hi] +I< 0 234 2 0 0 0.0 26-03:07:23 btrfs-delalloc [btrfs-delalloc] +I< 0 235 2 0 0 0.0 26-03:07:23 btrfs-flush_del [btrfs-flush_del] +I< 0 236 2 0 0 0.0 26-03:07:23 btrfs-cache [btrfs-cache] +I< 0 237 2 0 0 0.0 26-03:07:23 btrfs-fixup [btrfs-fixup] +I< 0 238 2 0 0 0.0 26-03:07:23 btrfs-endio [btrfs-endio] +I< 0 239 2 0 0 0.0 26-03:07:23 btrfs-endio-met [btrfs-endio-met] +I< 0 240 2 0 0 0.0 26-03:07:23 btrfs-endio-met [btrfs-endio-met] +I< 0 241 2 0 0 0.0 26-03:07:23 btrfs-endio-rai [btrfs-endio-rai] +I< 0 242 2 0 0 0.0 26-03:07:23 btrfs-rmw [btrfs-rmw] +I< 0 243 2 0 0 0.0 26-03:07:23 btrfs-endio-wri [btrfs-endio-wri] +I< 0 244 2 0 0 0.0 26-03:07:23 btrfs-freespace [btrfs-freespace] +I< 0 245 2 0 0 0.0 26-03:07:23 btrfs-delayed-m [btrfs-delayed-m] +I< 0 246 2 0 0 0.0 26-03:07:23 btrfs-readahead [btrfs-readahead] +I< 0 247 2 0 0 0.0 26-03:07:23 btrfs-qgroup-re [btrfs-qgroup-re] +S 0 248 2 0 0 0.0 26-03:07:23 btrfs-cleaner [btrfs-cleaner] +S 0 249 2 0 0 0.2 26-03:07:23 btrfs-transacti [btrfs-transacti] +I< 0 317 2 0 0 0.0 26-03:07:22 rpciod [rpciod] +I< 0 322 2 0 0 0.0 26-03:07:22 xprtiod [xprtiod] +S 0 381 2 0 0 0.0 26-03:07:22 irq/133-mei_me [irq/133-mei_me] +S 0 422 2 0 0 0.0 26-03:07:22 watchdogd [watchdogd] +I< 0 523 2 0 0 0.0 26-03:07:22 led_workqueue [led_workqueue] +I< 0 583 2 0 0 0.0 26-03:07:22 cryptd [cryptd] +I< 0 590 2 0 0 0.0 26-03:07:22 ext4-rsv-conver [ext4-rsv-conver] +Ss 104 693 1 12324 4292 0.5 26-03:07:21 dbus-daemon /usr/bin/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only +Ss 0 731 1 575120 1368 0.0 26-03:07:21 systemd-logind /lib/systemd/systemd-logind +Ssl 0 1111 1 121248 732 0.0 26-03:07:18 unattended-upgr /usr/bin/python3 /usr/share/unattended-upgrades/unattended-upgrade-shutdown --wait-for-signal +S 0 1141 2 0 0 0.0 26-03:07:18 lockd [lockd] +I< 0 1459 2 0 0 0.0 26-03:07:16 nfsiod [nfsiod] +S 0 1621 2 0 0 0.0 26-03:07:15 NFSv4 callback [NFSv4 callback] +Ssl 0 1771 1 1548340 676 0.0 26-03:07:13 libvirtd /usr/sbin/libvirtd +I< 0 24315 2 0 0 0.0 26-02:49:02 cifsiod [cifsiod] +I< 0 24316 2 0 0 0.0 26-02:49:02 smb3decryptd [smb3decryptd] +I< 0 24317 2 0 0 0.0 26-02:49:02 cifsfileinfoput [cifsfileinfoput] +I< 0 24318 2 0 0 0.0 26-02:49:02 cifsoplockd [cifsoplockd] +I< 0 24319 2 0 0 0.0 26-02:49:02 cifs-dfscache [cifs-dfscache] +S 0 24322 2 0 0 0.0 26-02:49:02 cifsd [cifsd] +I< 0 24413 2 0 0 0.0 26-02:48:57 btrfs-worker [btrfs-worker] +I< 0 24414 2 0 0 0.0 26-02:48:57 btrfs-worker-hi [btrfs-worker-hi] +I< 0 24415 2 0 0 0.0 26-02:48:57 btrfs-delalloc [btrfs-delalloc] +I< 0 24416 2 0 0 0.0 26-02:48:57 btrfs-flush_del [btrfs-flush_del] +I< 0 24418 2 0 0 0.0 26-02:48:57 btrfs-cache [btrfs-cache] +I< 0 24419 2 0 0 0.0 26-02:48:57 btrfs-fixup [btrfs-fixup] +I< 0 24420 2 0 0 0.0 26-02:48:57 btrfs-endio [btrfs-endio] +I< 0 24421 2 0 0 0.0 26-02:48:57 btrfs-endio-met [btrfs-endio-met] +I< 0 24422 2 0 0 0.0 26-02:48:57 btrfs-endio-met [btrfs-endio-met] +I< 0 24423 2 0 0 0.0 26-02:48:57 btrfs-endio-rai [btrfs-endio-rai] +I< 0 24424 2 0 0 0.0 26-02:48:57 btrfs-rmw [btrfs-rmw] +I< 0 24425 2 0 0 0.0 26-02:48:57 btrfs-endio-wri [btrfs-endio-wri] +I< 0 24426 2 0 0 0.0 26-02:48:57 btrfs-freespace [btrfs-freespace] +I< 0 24427 2 0 0 0.0 26-02:48:57 btrfs-delayed-m [btrfs-delayed-m] +I< 0 24428 2 0 0 0.0 26-02:48:57 btrfs-readahead [btrfs-readahead] +I< 0 24429 2 0 0 0.0 26-02:48:57 btrfs-qgroup-re [btrfs-qgroup-re] +S 0 24450 2 0 0 0.0 26-02:48:53 btrfs-cleaner [btrfs-cleaner] +S 0 24451 2 0 0 0.0 26-02:48:53 btrfs-transacti [btrfs-transacti] +I< 0 747708 2 0 0 0.0 16-21:06:20 xfsalloc [xfsalloc] +I< 0 747709 2 0 0 0.0 16-21:06:20 xfs_mru_cache [xfs_mru_cache] +S 0 747713 2 0 0 0.0 16-21:06:20 jfsIO [jfsIO] +S 0 747714 2 0 0 0.0 16-21:06:20 jfsCommit [jfsCommit] +S 0 747715 2 0 0 0.0 16-21:06:20 jfsCommit [jfsCommit] +S 0 747716 2 0 0 0.0 16-21:06:20 jfsCommit [jfsCommit] +S 0 747717 2 0 0 0.0 16-21:06:20 jfsCommit [jfsCommit] +S 0 747718 2 0 0 0.0 16-21:06:20 jfsSync [jfsSync] +Ss 0 1071687 1 105976 28304 0.0 3-03:12:31 systemd-journal /lib/systemd/systemd-journald +Ss 0 1934146 1 25672 4704 0.0 11:19:31 cupsd /usr/sbin/cupsd -l +Ssl 0 1934148 1 182868 8540 0.0 11:19:31 cups-browsed /usr/sbin/cups-browsed +S 13 1934155 3392655 5752 88 0.0 11:19:31 pinger (pinger) +S< 33 1934166 3393034 57996 5460 0.0 11:19:31 apache2 /usr/sbin/apache2 -k start +S< 33 1934167 3393034 216944 13892 0.0 11:19:30 apache2 /usr/sbin/apache2 -k start +S< 33 1934168 3393034 216944 13756 0.0 11:19:30 apache2 /usr/sbin/apache2 -k start +S< 33 1934169 3393034 216936 13732 0.0 11:19:30 apache2 /usr/sbin/apache2 -k start +S< 33 1934170 3393034 216944 13888 0.0 11:19:30 apache2 /usr/sbin/apache2 -k start +S< 33 1934172 3393034 216944 15388 0.0 11:19:30 apache2 /usr/sbin/apache2 -k start +S< 33 1934701 3393034 216936 13736 0.0 11:19:29 apache2 /usr/sbin/apache2 -k start +S< 33 1935056 3393034 216920 13724 0.0 11:19:28 apache2 /usr/sbin/apache2 -k start +S 7 1936834 1934146 16652 832 0.0 11:18:12 dbus /usr/lib/cups/notifier/dbus dbus:// +S< 33 1955909 3393034 216928 13792 0.0 11:00:25 apache2 /usr/sbin/apache2 -k start +I< 0 2531464 2 0 0 0.0 06:35:47 kworker/u9:0-i9 [kworker/u9:0-i915_flip] +I 0 2570506 2 0 0 0.0 06:27:41 kworker/1:0-cgr [kworker/1:0-cgroup_destroy] +I 0 2596195 2 0 0 0.0 06:21:52 kworker/1:1-eve [kworker/1:1-events] +I 0 2785341 2 0 0 0.0 03:34:16 kworker/u8:8-bt [kworker/u8:8-btrfs-endio-write] +I 0 2785520 2 0 0 0.0 03:33:50 kworker/3:0-eve [kworker/3:0-events] +I 0 2798669 2 0 0 0.0 03:21:09 kworker/u8:5-bt [kworker/u8:5-btrfs-endio-write] +Ss 0 2803015 1 5616 3108 0.0 03:17:54 cron /usr/sbin/cron -f +I 0 2845483 2 0 0 0.0 02:38:11 kworker/0:3-eve [kworker/0:3-events] +I 0 2939490 2 0 0 0.1 01:10:32 kworker/0:0-eve [kworker/0:0-events] +I 0 2939754 2 0 0 0.0 01:10:26 kworker/u8:1-i9 [kworker/u8:1-i915] +I 0 2942040 2 0 0 0.0 01:08:02 kworker/u8:7-bt [kworker/u8:7-btrfs-endio-meta] +S 117 2954268 3392551 40044 5772 0.0 56:37 pickup pickup -l -t unix -u -c +I 0 2965195 2 0 0 0.0 46:00 kworker/u8:0-bt [kworker/u8:0-btrfs-worker] +I 0 2977972 2 0 0 0.0 33:54 kworker/u8:2-bt [kworker/u8:2-btrfs-endio-write] +I 0 2985488 2 0 0 0.0 27:02 kworker/u8:3-bl [kworker/u8:3-blkcg_punt_bio] +I 0 2987519 2 0 0 1.0 25:15 kworker/2:1-eve [kworker/2:1-events] +I 0 2987601 2 0 0 0.0 25:03 kworker/u8:9-i9 [kworker/u8:9-i915] +I< 0 2995218 2 0 0 0.0 18:41 kworker/u9:2-xp [kworker/u9:2-xprtiod] +I 0 2997170 2 0 0 0.0 16:41 kworker/3:1-rcu [kworker/3:1-rcu_gp] +I 0 3001264 2 0 0 0.0 13:01 kworker/u8:4-bt [kworker/u8:4-btrfs-endio-write] +I 0 3004697 2 0 0 0.7 09:41 kworker/2:0-eve [kworker/2:0-events] +I 0 3010619 2 0 0 1.0 04:29 kworker/2:2-eve [kworker/2:2-events] +I 0 3014612 2 0 0 0.0 00:41 kworker/3:2-eve [kworker/3:2-events] +S 0 3015082 2803015 6716 3028 0.0 00:30 cron /usr/sbin/CRON -f +I 0 3015382 2 0 0 0.0 00:00 kworker/u8:6-bt [kworker/u8:6-btrfs-endio-meta] +Ss 1 3392068 1 5592 504 0.0 15-02:34:39 atd /usr/sbin/atd -f +Ssl 0 3392072 1 235796 1740 0.0 15-02:34:39 accounts-daemon /usr/libexec/accounts-daemon +Ssl 106 3392076 1 315708 6128 0.0 15-02:34:39 colord /usr/libexec/colord +Ss 0 3392083 1 8120 720 0.0 15-02:34:39 haveged /usr/sbin/haveged --Foreground --verbose=1 +Ss 0 3392090 1 5168 132 0.0 15-02:34:39 blkmapd /usr/sbin/blkmapd +SNsl 111 3392094 1 155648 440 0.0 15-02:34:39 rtkit-daemon /usr/libexec/rtkit-daemon +Ssl 0 3392097 1 290168 1352 0.0 15-02:34:39 packagekitd /usr/libexec/packagekitd +Ss 128 3392100 1 7960 448 0.0 15-02:34:39 rpcbind /sbin/rpcbind -f -w +Ss 0 3392114 1 13432 616 0.0 15-02:34:39 systemd-machine /lib/systemd/systemd-machined +Ss 0 3392118 1 13316 848 0.0 15-02:34:39 sshd sshd: /usr/sbin/sshd -D [listener] 0 of 10-100 startups +Ssl 0 3392124 1 244072 2456 0.0 15-02:34:39 upowerd /usr/libexec/upowerd +Ssl 0 3392138 1 1634748 10684 0.0 15-02:34:39 containerd /usr/bin/containerd +Ssl 0 3392139 1 222768 1784 0.0 15-02:34:39 rsyslogd /usr/sbin/rsyslogd -n -iNONE +Ss 13 3392140 1 3344 152 0.0 15-02:34:39 polipo /usr/bin/polipo -c /etc/polipo/config pidFile=/var/run/polipo/polipo.pid daemonise=true +Ssl 119 3392156 1 76472 1688 0.0 15-02:34:39 ntpd /usr/sbin/ntpd -p /var/run/ntpd.pid -g -u 119:126 +Ss 120 3392168 1 4656 276 0.0 15-02:34:39 rpc.statd /sbin/rpc.statd --no-notify +Ss 0 3392171 1 5072 432 0.0 15-02:34:39 rpc.mountd /usr/sbin/rpc.mountd --manage-gids +Ss 0 3392176 1 5008 288 0.0 15-02:34:39 rpc.idmapd /usr/sbin/rpc.idmapd +Ss 105 3392184 1 15544 6816 3.5 15-02:34:39 avahi-daemon avahi-daemon: running [tsui.local] +Ss 0 3392186 1 25288 3860 0.0 15-02:34:39 systemd-udevd /lib/systemd/systemd-udevd +S 105 3392190 3392184 8788 52 0.0 15-02:34:39 avahi-daemon avahi-daemon: chroot helper +Ssl 0 3392197 1 396120 4188 0.0 15-02:34:39 udisksd /usr/libexec/udisks2/udisksd +Ssl 0 3392214 1 237504 6632 0.0 15-02:34:39 polkitd /usr/libexec/polkitd --no-debug +Ss 0 3392284 1 9684 560 0.0 15-02:34:38 xinetd /usr/sbin/xinetd -pidfile /run/xinetd.pid -stayalive -inetd_compat -inetd_ipv6 +Ssl 0 3392285 1 314840 1352 0.0 15-02:34:38 ModemManager /usr/sbin/ModemManager +Ss 0 3392317 1 2352 140 0.0 15-02:34:38 acpid /usr/sbin/acpid +S 0 3392400 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392401 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392402 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392403 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392404 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392405 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392407 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +S 0 3392410 2 0 0 0.0 15-02:34:38 nfsd [nfsd] +Ss 0 3392551 1 40092 1304 0.0 15-02:34:37 master /usr/lib/postfix/sbin/master -w +S 117 3392553 3392551 40156 568 0.0 15-02:34:37 qmgr qmgr -l -t unix -u +Ss 0 3392650 1 63652 4 0.0 15-02:34:36 squid /usr/sbin/squid --foreground -sYC +Ssl 116 3392652 1 1675196 93848 0.0 15-02:34:36 mariadbd /usr/sbin/mariadbd +S 13 3392655 3392650 81776 21232 0.0 15-02:34:36 squid (squid-1) --kid squid-1 --foreground -sYC +S 13 3392657 3392655 5572 68 0.0 15-02:34:36 log_file_daemon (logfile-daemon) /var/log/squid/access.log +S #include +#include +#include #include @@ -239,6 +241,46 @@ is_intnonneg (char *number) return FALSE; } +/* + * Checks whether the number in the string _number_ can be put inside a int64_t + * On success the number will be written to the _target_ address, if _target_ is not set + * to NULL. + */ +int is_int64(char *number, int64_t *target) { + errno = 0; + uint64_t tmp = strtoll(number, NULL, 10); + if (errno != 0) { + return 0; + } + if (tmp < INT64_MIN || tmp > INT64_MAX) { + return 0; + } + if (target != NULL) { + *target = tmp; + } + return 1; +} + +/* + * Checks whether the number in the string _number_ can be put inside a uint64_t + * On success the number will be written to the _target_ address, if _target_ is not set + * to NULL. + */ +int is_uint64(char *number, uint64_t *target) { + errno = 0; + uint64_t tmp = strtoll(number, NULL, 10); + if (errno != 0) { + return 0; + } + if (tmp < 0 || tmp > UINT64_MAX) { + return 0; + } + if (target != NULL) { + *target = tmp; + } + return 1; +} + int is_intpercent (char *number) { @@ -547,10 +589,94 @@ char *perfdata (const char *label, xasprintf (&data, "%s;", data); if (minp) - xasprintf (&data, "%s%ld", data, minv); + xasprintf (&data, "%s%ld;", data, minv); + else + xasprintf (&data, "%s;", data); if (maxp) - xasprintf (&data, "%s;%ld", data, maxv); + xasprintf (&data, "%s%ld", data, maxv); + + return data; +} + + +char *perfdata_uint64 (const char *label, + uint64_t val, + const char *uom, + int warnp, /* Warning present */ + uint64_t warn, + int critp, /* Critical present */ + uint64_t crit, + int minp, /* Minimum present */ + uint64_t minv, + int maxp, /* Maximum present */ + uint64_t maxv) +{ + char *data = NULL; + + if (strpbrk (label, "'= ")) + xasprintf (&data, "'%s'=%ld%s;", label, val, uom); + else + xasprintf (&data, "%s=%ld%s;", label, val, uom); + + if (warnp) + xasprintf (&data, "%s%lu;", data, warn); + else + xasprintf (&data, "%s;", data); + + if (critp) + xasprintf (&data, "%s%lu;", data, crit); + else + xasprintf (&data, "%s;", data); + + if (minp) + xasprintf (&data, "%s%lu;", data, minv); + else + xasprintf (&data, "%s;", data); + + if (maxp) + xasprintf (&data, "%s%lu", data, maxv); + + return data; +} + + +char *perfdata_int64 (const char *label, + int64_t val, + const char *uom, + int warnp, /* Warning present */ + int64_t warn, + int critp, /* Critical present */ + int64_t crit, + int minp, /* Minimum present */ + int64_t minv, + int maxp, /* Maximum present */ + int64_t maxv) +{ + char *data = NULL; + + if (strpbrk (label, "'= ")) + xasprintf (&data, "'%s'=%ld%s;", label, val, uom); + else + xasprintf (&data, "%s=%ld%s;", label, val, uom); + + if (warnp) + xasprintf (&data, "%s%ld;", data, warn); + else + xasprintf (&data, "%s;", data); + + if (critp) + xasprintf (&data, "%s%ld;", data, crit); + else + xasprintf (&data, "%s;", data); + + if (minp) + xasprintf (&data, "%s%ld;", data, minv); + else + xasprintf (&data, "%s;", data); + + if (maxp) + xasprintf (&data, "%s%ld", data, maxv); return data; } diff --git a/plugins/utils.h b/plugins/utils.h index 33a2054..5b54da3 100644 --- a/plugins/utils.h +++ b/plugins/utils.h @@ -16,6 +16,7 @@ suite of plugins. */ /* now some functions etc are being defined in ../lib/utils_base.c */ #include "utils_base.h" + #ifdef NP_EXTRA_OPTS /* Include extra-opts functions if compiled in */ #include "extra_opts.h" @@ -38,6 +39,8 @@ int is_intpos (char *); int is_intneg (char *); int is_intnonneg (char *); int is_intpercent (char *); +int is_uint64(char *number, uint64_t *target); +int is_int64(char *number, int64_t *target); int is_numeric (char *); int is_positive (char *); @@ -88,6 +91,12 @@ void usage_va(const char *fmt, ...) __attribute__((noreturn)); char *perfdata (const char *, long int, const char *, int, long int, int, long int, int, long int, int, long int); +char *perfdata_uint64 (const char *, uint64_t , const char *, int, uint64_t, + int, uint64_t, int, uint64_t, int, uint64_t); + +char *perfdata_int64 (const char *, int64_t, const char *, int, int64_t, + int, int64_t, int, int64_t, int, int64_t); + char *fperfdata (const char *, double, const char *, int, double, int, double, int, double, int, double); diff --git a/po/de.gmo b/po/de.gmo index f97c7fe..102d1fc 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 4f27640..40a411d 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: nagiosplug\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2021-04-10 16:17+0200\n" +"POT-Creation-Date: 2022-10-19 14:57+0200\n" "PO-Revision-Date: 2004-12-23 17:46+0100\n" "Last-Translator: <>\n" "Language-Team: English \n" @@ -19,101 +19,104 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);X-Generator: KBabel 1.3.1\n" -#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:91 -#: plugins/check_disk.c:204 plugins/check_dns.c:104 plugins/check_dummy.c:52 -#: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:105 -#: plugins/check_http.c:171 plugins/check_ldap.c:118 plugins/check_load.c:126 +#: plugins/check_by_ssh.c:88 plugins/check_cluster.c:76 plugins/check_dig.c:91 +#: plugins/check_disk.c:201 plugins/check_dns.c:106 plugins/check_dummy.c:52 +#: plugins/check_fping.c:95 plugins/check_game.c:82 plugins/check_hpjd.c:105 +#: plugins/check_http.c:173 plugins/check_ldap.c:118 plugins/check_load.c:128 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:124 #: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:780 #: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:557 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 -#: plugins/check_pgsql.c:173 plugins/check_ping.c:95 plugins/check_procs.c:172 -#: plugins/check_radius.c:172 plugins/check_real.c:80 plugins/check_smtp.c:141 -#: plugins/check_snmp.c:242 plugins/check_ssh.c:74 plugins/check_swap.c:111 +#: plugins/check_pgsql.c:175 plugins/check_ping.c:97 plugins/check_procs.c:172 +#: plugins/check_radius.c:172 plugins/check_real.c:80 plugins/check_smtp.c:143 +#: plugins/check_snmp.c:243 plugins/check_ssh.c:74 plugins/check_swap.c:118 #: plugins/check_tcp.c:222 plugins/check_time.c:78 plugins/check_ups.c:122 #: plugins/check_users.c:84 plugins/negate.c:210 plugins-root/check_dhcp.c:270 msgid "Could not parse arguments" msgstr "Argumente konnten nicht ausgewertet werden" -#: plugins/check_by_ssh.c:90 plugins/check_dig.c:85 plugins/check_dns.c:97 -#: plugins/check_nagios.c:95 plugins/check_pgsql.c:179 plugins/check_ping.c:99 -#: plugins/check_procs.c:188 plugins/check_snmp.c:342 plugins/negate.c:78 +#: plugins/check_by_ssh.c:92 plugins/check_dig.c:85 plugins/check_dns.c:99 +#: plugins/check_nagios.c:95 plugins/check_pgsql.c:181 plugins/check_ping.c:101 +#: plugins/check_procs.c:188 plugins/check_snmp.c:343 plugins/negate.c:78 msgid "Cannot catch SIGALRM" msgstr "Konnte SIGALRM nicht erhalten" -#: plugins/check_by_ssh.c:117 +#: plugins/check_by_ssh.c:107 +#, c-format +msgid "SSH connection failed: %s\n" +msgstr "" + +#: plugins/check_by_ssh.c:126 #, c-format msgid "Remote command execution failed: %s\n" msgstr "" -#: plugins/check_by_ssh.c:129 +#: plugins/check_by_ssh.c:141 #, c-format msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" msgstr "" -#: plugins/check_by_ssh.c:141 +#: plugins/check_by_ssh.c:153 #, c-format msgid "SSH WARNING: could not open %s\n" msgstr "SSH WARNING: Konnte %s nicht öffnen\n" -#: plugins/check_by_ssh.c:150 +#: plugins/check_by_ssh.c:162 #, c-format msgid "%s: Error parsing output\n" msgstr "" -#: plugins/check_by_ssh.c:228 plugins/check_disk.c:519 -#: plugins/check_http.c:283 plugins/check_ldap.c:334 plugins/check_pgsql.c:312 -#: plugins/check_procs.c:437 plugins/check_radius.c:319 -#: plugins/check_real.c:357 plugins/check_smtp.c:586 plugins/check_snmp.c:764 -#: plugins/check_ssh.c:140 plugins/check_tcp.c:519 plugins/check_time.c:302 -#: plugins/check_ups.c:556 plugins/negate.c:160 +#: plugins/check_by_ssh.c:242 plugins/check_disk.c:521 plugins/check_http.c:289 +#: plugins/check_ldap.c:334 plugins/check_pgsql.c:315 plugins/check_procs.c:437 +#: plugins/check_radius.c:319 plugins/check_real.c:357 plugins/check_smtp.c:591 +#: plugins/check_snmp.c:779 plugins/check_ssh.c:140 plugins/check_tcp.c:519 +#: plugins/check_time.c:302 plugins/check_ups.c:559 plugins/negate.c:160 msgid "Timeout interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" -#: plugins/check_by_ssh.c:238 plugins/check_pgsql.c:342 -#: plugins/check_radius.c:283 plugins/check_real.c:328 -#: plugins/check_smtp.c:511 plugins/check_tcp.c:525 plugins/check_time.c:296 -#: plugins/check_ups.c:518 +#: plugins/check_by_ssh.c:254 plugins/check_pgsql.c:345 +#: plugins/check_radius.c:283 plugins/check_real.c:328 plugins/check_smtp.c:516 +#: plugins/check_tcp.c:525 plugins/check_time.c:296 plugins/check_ups.c:521 msgid "Port must be a positive integer" msgstr "Port muss ein positiver Integer sein" -#: plugins/check_by_ssh.c:299 +#: plugins/check_by_ssh.c:315 #, fuzzy msgid "skip-stdout argument must be an integer" msgstr "skip-stdout argument muss ein Integer sein" -#: plugins/check_by_ssh.c:307 +#: plugins/check_by_ssh.c:323 #, fuzzy msgid "skip-stderr argument must be an integer" msgstr "skip-stderr argument muss ein Integer sein" -#: plugins/check_by_ssh.c:330 +#: plugins/check_by_ssh.c:349 #, c-format msgid "%s: You must provide a host name\n" msgstr "%s: Hostname muss angegeben werden\n" -#: plugins/check_by_ssh.c:348 +#: plugins/check_by_ssh.c:366 msgid "No remotecmd" msgstr "Kein remotecm" -#: plugins/check_by_ssh.c:362 +#: plugins/check_by_ssh.c:380 #, c-format msgid "%s: Argument limit of %d exceeded\n" msgstr "" -#: plugins/check_by_ssh.c:365 +#: plugins/check_by_ssh.c:383 #, fuzzy msgid "Can not (re)allocate 'commargv' buffer\n" msgstr "Konnte·url·nicht·zuweisen\n" -#: plugins/check_by_ssh.c:379 +#: plugins/check_by_ssh.c:397 #, c-format msgid "" "%s: In passive mode, you must provide a service name for each command.\n" msgstr "" "%s: Im passive mode muss ein Servicename für jeden Befehl angegeben werden.\n" -#: plugins/check_by_ssh.c:382 +#: plugins/check_by_ssh.c:400 #, fuzzy, c-format msgid "" "%s: In passive mode, you must provide the host short name from the " @@ -122,132 +125,139 @@ msgstr "" "%s: Im passive mode muss der \"host short name\" aus der Nagios " "Konfiguration angegeben werden\n" -#: plugins/check_by_ssh.c:396 +#: plugins/check_by_ssh.c:414 #, fuzzy, c-format msgid "This plugin uses SSH to execute commands on a remote host" msgstr "" "Dieses Plugin nutzt SSH um Befehle auf dem entfernten Rechner auszuführen\n" "\n" -#: plugins/check_by_ssh.c:411 +#: plugins/check_by_ssh.c:429 msgid "tell ssh to use Protocol 1 [optional]" msgstr "" -#: plugins/check_by_ssh.c:413 +#: plugins/check_by_ssh.c:431 msgid "tell ssh to use Protocol 2 [optional]" msgstr "" -#: plugins/check_by_ssh.c:415 +#: plugins/check_by_ssh.c:433 msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" msgstr "" -#: plugins/check_by_ssh.c:417 +#: plugins/check_by_ssh.c:435 msgid "Ignore all or (if specified) first n lines on STDERR [optional]" msgstr "" -#: plugins/check_by_ssh.c:419 +#: plugins/check_by_ssh.c:437 +msgid "Exit with an warning, if there is an output on STDERR" +msgstr "" + +#: plugins/check_by_ssh.c:439 msgid "" "tells ssh to fork rather than create a tty [optional]. This will always " "return OK if ssh is executed" msgstr "" -#: plugins/check_by_ssh.c:421 +#: plugins/check_by_ssh.c:441 msgid "command to execute on the remote machine" msgstr "" -#: plugins/check_by_ssh.c:423 +#: plugins/check_by_ssh.c:443 msgid "SSH user name on remote host [optional]" msgstr "" -#: plugins/check_by_ssh.c:425 +#: plugins/check_by_ssh.c:445 msgid "identity of an authorized key [optional]" msgstr "" -#: plugins/check_by_ssh.c:427 +#: plugins/check_by_ssh.c:447 msgid "external command file for monitoring [optional]" msgstr "" -#: plugins/check_by_ssh.c:429 +#: plugins/check_by_ssh.c:449 msgid "list of monitoring service names, separated by ':' [optional]" msgstr "" -#: plugins/check_by_ssh.c:431 +#: plugins/check_by_ssh.c:451 msgid "short name of host in the monitoring configuration [optional]" msgstr "" -#: plugins/check_by_ssh.c:433 +#: plugins/check_by_ssh.c:453 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" msgstr "" -#: plugins/check_by_ssh.c:435 +#: plugins/check_by_ssh.c:455 msgid "Tell ssh to use this configfile [optional]" msgstr "" -#: plugins/check_by_ssh.c:437 +#: plugins/check_by_ssh.c:457 msgid "Tell ssh to suppress warning and diagnostic messages [optional]" msgstr "" -#: plugins/check_by_ssh.c:442 +#: plugins/check_by_ssh.c:461 +msgid "Make connection problems return UNKNOWN instead of CRITICAL" +msgstr "" + +#: plugins/check_by_ssh.c:464 msgid "The most common mode of use is to refer to a local identity file with" msgstr "" -#: plugins/check_by_ssh.c:443 +#: plugins/check_by_ssh.c:465 msgid "the '-i' option. In this mode, the identity pair should have a null" msgstr "" -#: plugins/check_by_ssh.c:444 +#: plugins/check_by_ssh.c:466 msgid "passphrase and the public key should be listed in the authorized_keys" msgstr "" -#: plugins/check_by_ssh.c:445 +#: plugins/check_by_ssh.c:467 msgid "file of the remote host. Usually the key will be restricted to running" msgstr "" -#: plugins/check_by_ssh.c:446 +#: plugins/check_by_ssh.c:468 msgid "only one command on the remote server. If the remote SSH server tracks" msgstr "" -#: plugins/check_by_ssh.c:447 +#: plugins/check_by_ssh.c:469 msgid "invocation arguments, the one remote program may be an agent that can" msgstr "" -#: plugins/check_by_ssh.c:448 +#: plugins/check_by_ssh.c:470 msgid "execute additional commands as proxy" msgstr "" -#: plugins/check_by_ssh.c:450 +#: plugins/check_by_ssh.c:472 msgid "To use passive mode, provide multiple '-C' options, and provide" msgstr "" -#: plugins/check_by_ssh.c:451 +#: plugins/check_by_ssh.c:473 msgid "" "all of -O, -s, and -n options (servicelist order must match '-C'options)" msgstr "" -#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:271 -#: plugins/check_dig.c:364 plugins/check_disk.c:973 plugins/check_http.c:1688 +#: plugins/check_by_ssh.c:475 plugins/check_cluster.c:271 +#: plugins/check_dig.c:364 plugins/check_disk.c:936 plugins/check_http.c:1728 #: plugins/check_nagios.c:312 plugins/check_ntp.c:879 #: plugins/check_ntp_peer.c:733 plugins/check_ntp_time.c:642 #: plugins/check_procs.c:763 plugins/negate.c:249 plugins/urlize.c:179 msgid "Examples:" msgstr "" -#: plugins/check_by_ssh.c:468 plugins/check_cluster.c:284 -#: plugins/check_dig.c:376 plugins/check_disk.c:990 plugins/check_dns.c:588 -#: plugins/check_dummy.c:122 plugins/check_fping.c:505 -#: plugins/check_game.c:331 plugins/check_hpjd.c:438 plugins/check_http.c:1726 -#: plugins/check_ldap.c:508 plugins/check_load.c:348 plugins/check_mrtg.c:382 -#: plugins/check_mysql.c:584 plugins/check_nagios.c:323 plugins/check_nt.c:797 -#: plugins/check_ntp.c:898 plugins/check_ntp_peer.c:753 -#: plugins/check_ntp_time.c:651 plugins/check_nwstat.c:1685 -#: plugins/check_overcr.c:467 plugins/check_pgsql.c:579 -#: plugins/check_ping.c:610 plugins/check_procs.c:786 -#: plugins/check_radius.c:396 plugins/check_real.c:452 -#: plugins/check_smtp.c:850 plugins/check_snmp.c:1255 plugins/check_ssh.c:325 -#: plugins/check_swap.c:571 plugins/check_tcp.c:710 plugins/check_time.c:371 -#: plugins/check_ups.c:660 plugins/check_users.c:262 -#: plugins/check_ide_smart.c:606 plugins/negate.c:273 plugins/urlize.c:196 -#: plugins-root/check_dhcp.c:1394 plugins-root/check_icmp.c:1615 +#: plugins/check_by_ssh.c:490 plugins/check_cluster.c:284 +#: plugins/check_dig.c:376 plugins/check_disk.c:953 plugins/check_dns.c:617 +#: plugins/check_dummy.c:122 plugins/check_fping.c:524 plugins/check_game.c:331 +#: plugins/check_hpjd.c:439 plugins/check_http.c:1766 plugins/check_ldap.c:511 +#: plugins/check_load.c:372 plugins/check_mrtg.c:382 plugins/check_mysql.c:584 +#: plugins/check_nagios.c:323 plugins/check_nt.c:797 plugins/check_ntp.c:898 +#: plugins/check_ntp_peer.c:753 plugins/check_ntp_time.c:651 +#: plugins/check_nwstat.c:1685 plugins/check_overcr.c:467 +#: plugins/check_pgsql.c:588 plugins/check_ping.c:617 plugins/check_procs.c:786 +#: plugins/check_radius.c:396 plugins/check_real.c:452 plugins/check_smtp.c:860 +#: plugins/check_snmp.c:1284 plugins/check_ssh.c:325 plugins/check_swap.c:610 +#: plugins/check_tcp.c:710 plugins/check_time.c:371 plugins/check_ups.c:663 +#: plugins/check_users.c:262 plugins/check_ide_smart.c:606 plugins/negate.c:273 +#: plugins/urlize.c:196 plugins-root/check_dhcp.c:1394 +#: plugins-root/check_icmp.c:1630 msgid "Usage:" msgstr "" @@ -293,14 +303,14 @@ msgid "commas" msgstr "" #: plugins/check_cluster.c:267 plugins/check_game.c:318 -#: plugins/check_http.c:1670 plugins/check_ldap.c:494 plugins/check_mrtg.c:363 +#: plugins/check_http.c:1710 plugins/check_ldap.c:497 plugins/check_mrtg.c:363 #: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:573 #: plugins/check_nt.c:781 plugins/check_ntp.c:875 plugins/check_ntp_peer.c:724 #: plugins/check_ntp_time.c:633 plugins/check_nwstat.c:1670 -#: plugins/check_overcr.c:456 plugins/check_snmp.c:1226 -#: plugins/check_swap.c:559 plugins/check_ups.c:642 +#: plugins/check_overcr.c:456 plugins/check_snmp.c:1255 +#: plugins/check_swap.c:599 plugins/check_ups.c:645 #: plugins/check_ide_smart.c:580 plugins/negate.c:255 -#: plugins-root/check_icmp.c:1590 +#: plugins-root/check_icmp.c:1605 msgid "Notes:" msgstr "" @@ -309,7 +319,7 @@ msgid "" "Will alert critical if there are 3 or more service data points in a non-OK" msgstr "" -#: plugins/check_cluster.c:274 plugins/check_ups.c:639 +#: plugins/check_cluster.c:274 plugins/check_ups.c:642 msgid "state." msgstr "" @@ -394,88 +404,87 @@ msgstr "" msgid "Pass STRING as argument(s) to dig" msgstr "" -#: plugins/check_disk.c:226 +#: plugins/check_disk.c:223 #, fuzzy, c-format msgid "DISK %s: %s not found\n" msgstr "%s [%s nicht gefunden]" -#: plugins/check_disk.c:226 plugins/check_disk.c:1005 plugins/check_dns.c:279 +#: plugins/check_disk.c:223 plugins/check_disk.c:968 plugins/check_dns.c:295 #: plugins/check_dummy.c:74 plugins/check_mysql.c:310 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168 -#: plugins/check_nagios.c:172 plugins/check_pgsql.c:602 -#: plugins/check_pgsql.c:619 plugins/check_pgsql.c:628 -#: plugins/check_pgsql.c:643 plugins/check_procs.c:351 +#: plugins/check_nagios.c:172 plugins/check_pgsql.c:611 +#: plugins/check_pgsql.c:628 plugins/check_pgsql.c:637 +#: plugins/check_pgsql.c:652 plugins/check_procs.c:351 #, c-format msgid "CRITICAL" msgstr "CRITICAL" -#: plugins/check_disk.c:593 +#: plugins/check_disk.c:598 #, c-format msgid "unit type %s not known\n" msgstr "unbekannter unit type: %s\n" -#: plugins/check_disk.c:596 +#: plugins/check_disk.c:601 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/check_disk.c:624 plugins/check_disk.c:665 plugins/check_disk.c:673 -#: plugins/check_disk.c:680 plugins/check_disk.c:684 plugins/check_disk.c:724 -#: plugins/check_disk.c:730 plugins/check_disk.c:749 plugins/check_dummy.c:77 -#: plugins/check_dummy.c:80 plugins/check_pgsql.c:644 -#: plugins/check_procs.c:506 +#: plugins/check_disk.c:629 plugins/check_disk.c:670 plugins/check_disk.c:678 +#: plugins/check_disk.c:686 plugins/check_disk.c:690 plugins/check_disk.c:732 +#: plugins/check_disk.c:738 plugins/check_disk.c:757 plugins/check_dummy.c:77 +#: plugins/check_dummy.c:80 plugins/check_pgsql.c:653 plugins/check_procs.c:506 #, c-format msgid "UNKNOWN" msgstr "UNKNOWN" -#: plugins/check_disk.c:624 +#: plugins/check_disk.c:629 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:665 +#: plugins/check_disk.c:670 msgid "Must set -E before selecting paths\n" msgstr "" -#: plugins/check_disk.c:673 +#: plugins/check_disk.c:678 msgid "Must set group value before selecting paths\n" msgstr "" -#: plugins/check_disk.c:680 +#: plugins/check_disk.c:686 msgid "" "Paths need to be selected before using -i/-I. Use -A to select all paths " "explicitly" msgstr "" -#: plugins/check_disk.c:684 plugins/check_disk.c:730 plugins/check_procs.c:506 +#: plugins/check_disk.c:690 plugins/check_disk.c:738 plugins/check_procs.c:506 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:724 +#: plugins/check_disk.c:732 msgid "Must set a threshold value before using -r/-R\n" msgstr "" -#: plugins/check_disk.c:750 +#: plugins/check_disk.c:758 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:796 +#: plugins/check_disk.c:804 #, fuzzy msgid "Unknown argument" msgstr "Unbekanntes Argument" -#: plugins/check_disk.c:830 +#: plugins/check_disk.c:838 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:904 +#: plugins/check_disk.c:867 #, fuzzy msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "" "Dieses Plugin prüft den freien Speicher auf einem gemounteten Filesystem" -#: plugins/check_disk.c:905 +#: plugins/check_disk.c:868 #, fuzzy msgid "" "and generates an alert if free space is less than one of the threshold values" @@ -483,360 +492,374 @@ msgstr "" "und erzeugt einen Alarm wenn einer der angegebenen Schwellwerte " "unterschritten wird." -#: plugins/check_disk.c:915 +#: plugins/check_disk.c:878 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:917 +#: plugins/check_disk.c:880 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:919 +#: plugins/check_disk.c:882 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:921 +#: plugins/check_disk.c:884 msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:923 +#: plugins/check_disk.c:886 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:925 +#: plugins/check_disk.c:888 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:927 +#: plugins/check_disk.c:890 msgid "" "Mount point or block device as emitted by the mount(8) command (may be " "repeated)" msgstr "" -#: plugins/check_disk.c:929 +#: plugins/check_disk.c:892 msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:931 +#: plugins/check_disk.c:894 msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:933 +#: plugins/check_disk.c:896 msgid "For paths or partitions specified with -p, only check for exact paths" msgstr "" -#: plugins/check_disk.c:935 +#: plugins/check_disk.c:898 msgid "Display only devices/mountpoints with errors" msgstr "" -#: plugins/check_disk.c:937 +#: plugins/check_disk.c:900 msgid "Don't account root-reserved blocks into freespace in perfdata" msgstr "" -#: plugins/check_disk.c:939 +#: plugins/check_disk.c:902 msgid "Display inode usage in perfdata" msgstr "" -#: plugins/check_disk.c:941 +#: plugins/check_disk.c:904 msgid "" "Group paths. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:943 +#: plugins/check_disk.c:906 msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:945 +#: plugins/check_disk.c:908 msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:947 +#: plugins/check_disk.c:910 msgid "" "Only check local filesystems against thresholds. Yet call stat on remote " "filesystems" msgstr "" -#: plugins/check_disk.c:948 +#: plugins/check_disk.c:911 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" msgstr "" -#: plugins/check_disk.c:950 -msgid "Display the mountpoint instead of the partition" +#: plugins/check_disk.c:913 +msgid "Display the (block) device instead of the mount point" msgstr "" -#: plugins/check_disk.c:952 +#: plugins/check_disk.c:915 msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:954 +#: plugins/check_disk.c:917 msgid "Explicitly select all paths. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:956 +#: plugins/check_disk.c:919 msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:958 +#: plugins/check_disk.c:921 msgid "Regular expression for path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:960 +#: plugins/check_disk.c:923 msgid "" "Regular expression to ignore selected path/partition (case insensitive) (may " "be repeated)" msgstr "" -#: plugins/check_disk.c:962 +#: plugins/check_disk.c:925 msgid "" "Regular expression to ignore selected path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:965 +#: plugins/check_disk.c:928 msgid "Choose bytes, kB, MB, GB, TB (default: MB)" msgstr "" -#: plugins/check_disk.c:968 +#: plugins/check_disk.c:931 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:970 +#: plugins/check_disk.c:933 msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:975 +#: plugins/check_disk.c:938 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" -#: plugins/check_disk.c:977 +#: plugins/check_disk.c:940 msgid "" "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" "r regex" msgstr "" -#: plugins/check_disk.c:978 +#: plugins/check_disk.c:941 msgid "" "are grouped which means the freespace thresholds are applied to all disks " "together" msgstr "" -#: plugins/check_disk.c:980 +#: plugins/check_disk.c:943 msgid "" "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " "100M/50M" msgstr "" -#: plugins/check_disk.c:1006 +#: plugins/check_disk.c:969 #, c-format msgid "%s %s: %s\n" msgstr "" -#: plugins/check_disk.c:1006 +#: plugins/check_disk.c:969 msgid "is not accessible" msgstr "" -#: plugins/check_dns.c:118 +#: plugins/check_dns.c:120 #, fuzzy msgid "nslookup returned an error status" msgstr "nslookup hat einen Fehler zurückgegeben" -#: plugins/check_dns.c:136 +#: plugins/check_dns.c:138 msgid "Warning plugin error" msgstr "Warnung Plugin Fehler" -#: plugins/check_dns.c:154 +#: plugins/check_dns.c:156 #, fuzzy, c-format msgid "DNS CRITICAL - '%s' returned empty server string\n" msgstr "DNS CRITICAL - '%s' hat einen leeren Hostnamen zurückgegeben\n" -#: plugins/check_dns.c:159 +#: plugins/check_dns.c:161 #, fuzzy, c-format msgid "DNS CRITICAL - No response from DNS %s\n" msgstr "Keine Antwort von DNS %s\n" -#: plugins/check_dns.c:178 +#: plugins/check_dns.c:180 #, c-format msgid "DNS CRITICAL - '%s' returned empty host name string\n" msgstr "DNS CRITICAL - '%s' hat einen leeren Hostnamen zurückgegeben\n" -#: plugins/check_dns.c:184 +#: plugins/check_dns.c:186 msgid "Non-authoritative answer:" msgstr "" -#: plugins/check_dns.c:228 +#: plugins/check_dns.c:215 +#, fuzzy, c-format +msgid "Domain '%s' was not found by the server\n" +msgstr "Domäne %s wurde vom Server nicht gefunden\n" + +#: plugins/check_dns.c:234 #, fuzzy, c-format msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n" msgstr "DNS CRITICAL - '%s' Ausgabeverarbeitung hat keine Adresse ergeben\n" -#: plugins/check_dns.c:259 +#: plugins/check_dns.c:265 #, fuzzy, c-format msgid "expected '%s' but got '%s'" msgstr "Erwartet: %s aber: %s erhalten" -#: plugins/check_dns.c:266 +#: plugins/check_dns.c:272 +#, fuzzy, c-format +msgid "Domain '%s' was found by the server: '%s'\n" +msgstr "Domäne %s wurde vom Server nicht gefunden\n" + +#: plugins/check_dns.c:282 #, c-format msgid "server %s is not authoritative for %s" msgstr "Server %s ist nicht autoritativ für %s" -#: plugins/check_dns.c:275 plugins/check_dummy.c:68 plugins/check_nagios.c:182 -#: plugins/check_pgsql.c:639 plugins/check_procs.c:344 +#: plugins/check_dns.c:291 plugins/check_dummy.c:68 plugins/check_nagios.c:182 +#: plugins/check_pgsql.c:648 plugins/check_procs.c:344 #, c-format msgid "OK" msgstr "OK" -#: plugins/check_dns.c:277 plugins/check_dummy.c:71 plugins/check_mysql.c:307 -#: plugins/check_nagios.c:182 plugins/check_pgsql.c:608 -#: plugins/check_pgsql.c:613 plugins/check_pgsql.c:641 +#: plugins/check_dns.c:293 plugins/check_dummy.c:71 plugins/check_mysql.c:307 +#: plugins/check_nagios.c:182 plugins/check_pgsql.c:617 +#: plugins/check_pgsql.c:622 plugins/check_pgsql.c:650 #: plugins/check_procs.c:346 #, c-format msgid "WARNING" msgstr "WARNING" -#: plugins/check_dns.c:281 +#: plugins/check_dns.c:297 #, fuzzy, c-format msgid "%.3f second response time" msgid_plural "%.3f seconds response time" msgstr[0] "%.3f Sekunden Antwortzeit " msgstr[1] "%.3f Sekunden Antwortzeit " -#: plugins/check_dns.c:282 +#: plugins/check_dns.c:298 #, fuzzy, c-format msgid ". %s returns %s" msgstr "%s hat %s zurückgegeben" -#: plugins/check_dns.c:302 +#: plugins/check_dns.c:318 #, c-format msgid "DNS WARNING - %s\n" msgstr "DNS WARNING - %s\n" -#: plugins/check_dns.c:303 plugins/check_dns.c:306 plugins/check_dns.c:309 +#: plugins/check_dns.c:319 plugins/check_dns.c:322 plugins/check_dns.c:325 msgid " Probably a non-existent host/domain" msgstr "nicht existierender Host/Domain" -#: plugins/check_dns.c:305 +#: plugins/check_dns.c:321 #, c-format msgid "DNS CRITICAL - %s\n" msgstr "DNS CRITICAL - %s\n" -#: plugins/check_dns.c:308 +#: plugins/check_dns.c:324 #, fuzzy, c-format msgid "DNS UNKNOWN - %s\n" msgstr "DNS UNKNOWN - %s\n" -#: plugins/check_dns.c:346 +#: plugins/check_dns.c:368 msgid "Note: nslookup is deprecated and may be removed from future releases." msgstr "" -#: plugins/check_dns.c:347 +#: plugins/check_dns.c:369 msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" msgstr "" -#: plugins/check_dns.c:348 +#: plugins/check_dns.c:370 msgid "the `-sil[ent]' option to prevent this message from appearing." msgstr "" -#: plugins/check_dns.c:353 plugins/check_dns.c:355 +#: plugins/check_dns.c:375 plugins/check_dns.c:377 #, c-format msgid "No response from DNS %s\n" msgstr "Keine Antwort von DNS %s\n" -#: plugins/check_dns.c:359 +#: plugins/check_dns.c:381 #, c-format msgid "DNS %s has no records\n" msgstr "Nameserver %s hat keine Datensätze\n" -#: plugins/check_dns.c:367 +#: plugins/check_dns.c:389 #, c-format msgid "Connection to DNS %s was refused\n" msgstr "Verbindung zum Nameserver %s wurde verweigert\n" -#: plugins/check_dns.c:371 +#: plugins/check_dns.c:393 #, c-format msgid "Query was refused by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:375 +#: plugins/check_dns.c:397 #, c-format msgid "No information returned by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:382 -#, c-format -msgid "Domain %s was not found by the server\n" -msgstr "Domäne %s wurde vom Server nicht gefunden\n" - -#: plugins/check_dns.c:386 +#: plugins/check_dns.c:401 msgid "Network is unreachable\n" msgstr "Netzwerk nicht erreichbar\n" -#: plugins/check_dns.c:390 +#: plugins/check_dns.c:405 #, c-format msgid "DNS failure for %s\n" msgstr "DNS Fehler für %s\n" -#: plugins/check_dns.c:455 plugins/check_dns.c:463 plugins/check_dns.c:470 -#: plugins/check_dns.c:475 plugins/check_dns.c:514 plugins/check_dns.c:522 +#: plugins/check_dns.c:471 plugins/check_dns.c:479 plugins/check_dns.c:486 +#: plugins/check_dns.c:491 plugins/check_dns.c:533 plugins/check_dns.c:541 #: plugins/check_game.c:211 plugins/check_game.c:219 msgid "Input buffer overflow\n" msgstr "Eingabe-Pufferüberlauf\n" -#: plugins/check_dns.c:550 +#: plugins/check_dns.c:576 msgid "" "This plugin uses the nslookup program to obtain the IP address for the given " "host/domain query." msgstr "" -#: plugins/check_dns.c:551 +#: plugins/check_dns.c:577 msgid "An optional DNS server to use may be specified." msgstr "" -#: plugins/check_dns.c:552 +#: plugins/check_dns.c:578 msgid "" "If no DNS server is specified, the default server(s) specified in /etc/" "resolv.conf will be used." msgstr "" -#: plugins/check_dns.c:562 +#: plugins/check_dns.c:588 msgid "The name or address you want to query" msgstr "" -#: plugins/check_dns.c:564 +#: plugins/check_dns.c:590 msgid "Optional DNS server you want to use for the lookup" msgstr "" -#: plugins/check_dns.c:566 +#: plugins/check_dns.c:592 msgid "" "Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end" msgstr "" -#: plugins/check_dns.c:567 +#: plugins/check_dns.c:593 msgid "" "with a dot (.). This option can be repeated multiple times (Returns OK if any" msgstr "" -#: plugins/check_dns.c:568 +#: plugins/check_dns.c:594 msgid "value matches)." msgstr "" -#: plugins/check_dns.c:570 +#: plugins/check_dns.c:596 +msgid "" +"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)" +msgstr "" + +#: plugins/check_dns.c:597 +msgid "Cannot be used together with -a" +msgstr "" + +#: plugins/check_dns.c:599 msgid "Optionally expect the DNS server to be authoritative for the lookup" msgstr "" -#: plugins/check_dns.c:572 +#: plugins/check_dns.c:601 msgid "Return warning if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:574 +#: plugins/check_dns.c:603 msgid "Return critical if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:576 +#: plugins/check_dns.c:605 msgid "" "Return critical if the list of expected addresses does not match all " "addresses" msgstr "" -#: plugins/check_dns.c:577 +#: plugins/check_dns.c:606 msgid "returned. Default off" msgstr "" @@ -858,180 +881,188 @@ msgstr "" msgid "of the argument with optional text" msgstr "" -#: plugins/check_fping.c:125 plugins/check_hpjd.c:130 plugins/check_ping.c:438 -#: plugins/check_swap.c:176 plugins/check_users.c:130 plugins/urlize.c:109 +#: plugins/check_fping.c:127 plugins/check_hpjd.c:134 plugins/check_ping.c:444 +#: plugins/check_swap.c:196 plugins/check_users.c:130 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "Pipe: %s konnte nicht geöffnet werden\n" -#: plugins/check_fping.c:131 plugins/check_hpjd.c:136 plugins/check_load.c:157 -#: plugins/check_swap.c:182 plugins/check_users.c:136 plugins/urlize.c:115 +#: plugins/check_fping.c:133 plugins/check_hpjd.c:140 plugins/check_load.c:159 +#: plugins/check_swap.c:202 plugins/check_users.c:136 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "Konnte stderr nicht öffnen für: %s\n" -#: plugins/check_fping.c:157 +#: plugins/check_fping.c:161 #, fuzzy msgid "FPING UNKNOWN - IP address not found\n" msgstr "FPING UNKNOWN - %s nicht gefunden\n" -#: plugins/check_fping.c:160 +#: plugins/check_fping.c:164 msgid "FPING UNKNOWN - invalid commandline argument\n" msgstr "" -#: plugins/check_fping.c:163 +#: plugins/check_fping.c:167 #, fuzzy msgid "FPING UNKNOWN - failed system call\n" msgstr "FPING UNKNOWN - %s nicht gefunden\n" -#: plugins/check_fping.c:187 +#: plugins/check_fping.c:194 +#, fuzzy, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" + +#: plugins/check_fping.c:202 #, c-format msgid "FPING UNKNOWN - %s not found\n" msgstr "FPING UNKNOWN - %s nicht gefunden\n" -#: plugins/check_fping.c:191 +#: plugins/check_fping.c:206 #, c-format msgid "FPING CRITICAL - %s is unreachable\n" msgstr "FPING CRITICAL - %s ist nicht erreichbar\n" -#: plugins/check_fping.c:196 +#: plugins/check_fping.c:211 #, fuzzy, c-format msgid "FPING UNKNOWN - %s parameter error\n" msgstr "FPING UNKNOWN - %s nicht gefunden\n" -#: plugins/check_fping.c:200 plugins/check_fping.c:240 +#: plugins/check_fping.c:215 plugins/check_fping.c:255 #, c-format msgid "FPING CRITICAL - %s is down\n" msgstr "FPING CRITICAL - %s ist down\n" -#: plugins/check_fping.c:227 +#: plugins/check_fping.c:242 #, c-format msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" msgstr "FPING %s - %s (verloren=%.0f%%, rta=%f ms)|%s %s\n" -#: plugins/check_fping.c:253 +#: plugins/check_fping.c:268 #, c-format msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "FPING %s - %s (verloren=%.0f%% )|%s\n" -#: plugins/check_fping.c:326 plugins/check_fping.c:332 -#: plugins/check_hpjd.c:341 plugins/check_hpjd.c:372 plugins/check_mysql.c:386 -#: plugins/check_mysql.c:473 plugins/check_ntp.c:719 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 -#: plugins/check_pgsql.c:336 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:275 plugins/check_real.c:315 -#: plugins/check_real.c:377 plugins/check_smtp.c:504 plugins/check_smtp.c:646 -#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 -#: plugins/check_ups.c:504 plugins/check_ups.c:573 +#: plugins/check_fping.c:345 plugins/check_fping.c:351 plugins/check_hpjd.c:345 +#: plugins/check_hpjd.c:376 plugins/check_mysql.c:386 plugins/check_mysql.c:473 +#: plugins/check_ntp.c:719 plugins/check_ntp_peer.c:497 +#: plugins/check_ntp_time.c:498 plugins/check_pgsql.c:339 +#: plugins/check_ping.c:301 plugins/check_ping.c:424 plugins/check_radius.c:275 +#: plugins/check_real.c:315 plugins/check_real.c:377 plugins/check_smtp.c:509 +#: plugins/check_smtp.c:654 plugins/check_ssh.c:162 plugins/check_time.c:240 +#: plugins/check_time.c:315 plugins/check_ups.c:507 plugins/check_ups.c:576 msgid "Invalid hostname/address" msgstr "Ungültige(r) Hostname/Adresse" -#: plugins/check_fping.c:345 plugins/check_ldap.c:400 plugins/check_ping.c:246 -#: plugins-root/check_icmp.c:480 +#: plugins/check_fping.c:364 plugins/check_ldap.c:400 plugins/check_ping.c:252 +#: plugins-root/check_icmp.c:469 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_fping.c:378 +#: plugins/check_fping.c:397 msgid "Packet size must be a positive integer" msgstr "Paketgröße muss ein positiver Integer sein" -#: plugins/check_fping.c:384 +#: plugins/check_fping.c:403 msgid "Packet count must be a positive integer" msgstr "Paketanzahl muss ein positiver Integer sein" -#: plugins/check_fping.c:390 +#: plugins/check_fping.c:409 #, fuzzy msgid "Target timeout must be a positive integer" msgstr "Warnung time muss ein positiver Integer sein" -#: plugins/check_fping.c:396 +#: plugins/check_fping.c:415 #, fuzzy msgid "Interval must be a positive integer" msgstr "Timeout interval muss ein positiver Integer sein" -#: plugins/check_fping.c:402 plugins/check_ntp.c:743 +#: plugins/check_fping.c:421 plugins/check_ntp.c:743 #: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:528 #: plugins/check_radius.c:325 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "" -#: plugins/check_fping.c:422 +#: plugins/check_fping.c:441 #, c-format msgid "%s: Only one threshold may be packet loss (%s)\n" msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n" -#: plugins/check_fping.c:426 +#: plugins/check_fping.c:445 #, c-format msgid "%s: Only one threshold must be packet loss (%s)\n" msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n" -#: plugins/check_fping.c:458 +#: plugins/check_fping.c:475 msgid "" "This plugin will use the fping command to ping the specified host for a fast " "check" msgstr "" -#: plugins/check_fping.c:460 +#: plugins/check_fping.c:477 msgid "Note that it is necessary to set the suid flag on fping." msgstr "" -#: plugins/check_fping.c:472 +#: plugins/check_fping.c:489 msgid "" "name or IP Address of host to ping (IP Address bypasses name lookup, " "reducing system load)" msgstr "" -#: plugins/check_fping.c:474 plugins/check_ping.c:582 +#: plugins/check_fping.c:491 plugins/check_ping.c:589 #, fuzzy msgid "warning threshold pair" msgstr "Warning threshold Integer sein" -#: plugins/check_fping.c:476 plugins/check_ping.c:584 +#: plugins/check_fping.c:493 plugins/check_ping.c:591 #, fuzzy msgid "critical threshold pair" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_fping.c:478 +#: plugins/check_fping.c:495 +msgid "Return OK after first successfull reply" +msgstr "" + +#: plugins/check_fping.c:497 msgid "size of ICMP packet" msgstr "" -#: plugins/check_fping.c:480 +#: plugins/check_fping.c:499 msgid "number of ICMP packets to send" msgstr "" -#: plugins/check_fping.c:482 +#: plugins/check_fping.c:501 msgid "Target timeout (ms)" msgstr "" -#: plugins/check_fping.c:484 +#: plugins/check_fping.c:503 msgid "Interval (ms) between sending packets" msgstr "" -#: plugins/check_fping.c:486 +#: plugins/check_fping.c:505 msgid "name or IP Address of sourceip" msgstr "" -#: plugins/check_fping.c:488 +#: plugins/check_fping.c:507 msgid "source interface name" msgstr "" -#: plugins/check_fping.c:491 +#: plugins/check_fping.c:510 #, c-format msgid "" "THRESHOLD is ,%% where is the round trip average travel time " "(ms)" msgstr "" -#: plugins/check_fping.c:492 +#: plugins/check_fping.c:511 msgid "" "which triggers a WARNING or CRITICAL state, and is the percentage of" msgstr "" -#: plugins/check_fping.c:493 +#: plugins/check_fping.c:512 msgid "packet loss to trigger an alarm state." msgstr "" -#: plugins/check_fping.c:496 +#: plugins/check_fping.c:515 msgid "IPv4 is used by default. Specify -6 to use IPv6." msgstr "" @@ -1089,66 +1120,64 @@ msgid "" msgstr "" #: plugins/check_game.c:321 -msgid "" -"http://www.activesw.com/people/steve/qstat.html before you can use this " -"plugin." +msgid "https://github.com/multiplay/qstat before you can use this plugin." msgstr "" -#: plugins/check_hpjd.c:241 +#: plugins/check_hpjd.c:245 msgid "Paper Jam" msgstr "Papierstau" -#: plugins/check_hpjd.c:246 +#: plugins/check_hpjd.c:250 msgid "Out of Paper" msgstr "Kein Papier" -#: plugins/check_hpjd.c:251 +#: plugins/check_hpjd.c:255 msgid "Printer Offline" msgstr "Drucker ausgeschaltet" -#: plugins/check_hpjd.c:256 +#: plugins/check_hpjd.c:260 msgid "Peripheral Error" msgstr "Peripheriefehler" -#: plugins/check_hpjd.c:260 +#: plugins/check_hpjd.c:264 msgid "Intervention Required" msgstr "Eingriff benötigt" -#: plugins/check_hpjd.c:264 +#: plugins/check_hpjd.c:268 msgid "Toner Low" msgstr "Wenig Toner" -#: plugins/check_hpjd.c:268 +#: plugins/check_hpjd.c:272 msgid "Insufficient Memory" msgstr "Nicht genügend Speicher" -#: plugins/check_hpjd.c:272 +#: plugins/check_hpjd.c:276 msgid "A Door is Open" msgstr "Eine Abdeckung ist offen" -#: plugins/check_hpjd.c:276 +#: plugins/check_hpjd.c:280 msgid "Output Tray is Full" msgstr "Ausgabeschacht ist voll" -#: plugins/check_hpjd.c:280 +#: plugins/check_hpjd.c:284 msgid "Data too Slow for Engine" msgstr "" -#: plugins/check_hpjd.c:284 +#: plugins/check_hpjd.c:288 msgid "Unknown Paper Error" msgstr "Papierfehler" -#: plugins/check_hpjd.c:289 +#: plugins/check_hpjd.c:293 #, c-format msgid "Printer ok - (%s)\n" msgstr "Printer ok - (%s)\n" -#: plugins/check_hpjd.c:349 +#: plugins/check_hpjd.c:353 #, fuzzy msgid "Port must be a positive short integer" msgstr "Port muss ein positiver Integer sein" -#: plugins/check_hpjd.c:409 +#: plugins/check_hpjd.c:410 #, fuzzy msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." msgstr "" @@ -1157,7 +1186,7 @@ msgstr "" "Net-snmp muss auf dem ausführenden Computer installiert sein.\n" "\n" -#: plugins/check_hpjd.c:410 +#: plugins/check_hpjd.c:411 #, fuzzy msgid "Net-snmp must be installed on the computer running the plugin." msgstr "" @@ -1166,597 +1195,620 @@ msgstr "" "Net-snmp muss auf dem ausführenden Computer installiert sein.\n" "\n" -#: plugins/check_hpjd.c:420 +#: plugins/check_hpjd.c:421 msgid "The SNMP community name " msgstr "" -#: plugins/check_hpjd.c:421 plugins/check_hpjd.c:425 +#: plugins/check_hpjd.c:422 plugins/check_hpjd.c:426 #, c-format msgid "(default=%s)" msgstr "" -#: plugins/check_hpjd.c:424 +#: plugins/check_hpjd.c:425 msgid "Specify the port to check " msgstr "" -#: plugins/check_hpjd.c:428 +#: plugins/check_hpjd.c:429 msgid "Disable paper check " msgstr "" -#: plugins/check_http.c:193 +#: plugins/check_http.c:195 msgid "file does not exist or is not readable" msgstr "" -#: plugins/check_http.c:315 plugins/check_http.c:320 plugins/check_http.c:326 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:590 plugins/check_tcp.c:595 +#: plugins/check_http.c:321 plugins/check_http.c:326 plugins/check_http.c:332 +#: plugins/check_smtp.c:605 plugins/check_tcp.c:590 plugins/check_tcp.c:595 #: plugins/check_tcp.c:601 msgid "Invalid certificate expiration period" msgstr "Ungültiger Zertifikatsablauftermin" -#: plugins/check_http.c:364 +#: plugins/check_http.c:375 msgid "" "Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " "'+' suffix)" msgstr "" -#: plugins/check_http.c:370 plugins/check_tcp.c:614 plugins/check_tcp.c:623 +#: plugins/check_http.c:381 plugins/check_tcp.c:614 plugins/check_tcp.c:623 #, fuzzy msgid "Invalid option - SSL is not available" msgstr "Ungültige Option - SSL ist nicht verfügbar\n" -#: plugins/check_http.c:391 +#: plugins/check_http.c:389 +msgid "Invalid max_redirs count" +msgstr "" + +#: plugins/check_http.c:409 msgid "Invalid onredirect option" msgstr "" -#: plugins/check_http.c:393 +#: plugins/check_http.c:411 #, c-format msgid "option f:%d \n" msgstr "Option f:%d \n" -#: plugins/check_http.c:428 +#: plugins/check_http.c:446 msgid "Invalid port number" msgstr "Ungültige Portnummer" -#: plugins/check_http.c:486 +#: plugins/check_http.c:504 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:500 plugins/check_ntp.c:732 +#: plugins/check_http.c:518 plugins/check_ntp.c:732 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:517 -#: plugins/check_smtp.c:626 plugins/check_ssh.c:151 plugins/check_tcp.c:491 +#: plugins/check_smtp.c:634 plugins/check_ssh.c:151 plugins/check_tcp.c:491 msgid "IPv6 support not available" msgstr "IPv6 Unterstützung nicht vorhanden" -#: plugins/check_http.c:568 plugins/check_ping.c:422 +#: plugins/check_http.c:586 plugins/check_ping.c:428 msgid "You must specify a server address or host name" msgstr "Hostname oder Serveradresse muss angegeben werden" -#: plugins/check_http.c:585 +#: plugins/check_http.c:603 msgid "" "If you use a client certificate you must also specify a private key file" msgstr "" -#: plugins/check_http.c:712 plugins/check_http.c:880 +#: plugins/check_http.c:730 plugins/check_http.c:898 #, fuzzy msgid "HTTP UNKNOWN - Memory allocation error\n" msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" -#: plugins/check_http.c:784 +#: plugins/check_http.c:802 #, fuzzy, c-format msgid "%sServer date unknown, " msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" -#: plugins/check_http.c:787 +#: plugins/check_http.c:805 #, fuzzy, c-format msgid "%sDocument modification date unknown, " msgstr "HTTP CRITICAL - Datum der letzten Änderung unbekannt\n" -#: plugins/check_http.c:794 +#: plugins/check_http.c:812 #, fuzzy, c-format msgid "%sServer date \"%100s\" unparsable, " msgstr "HTTP CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" -#: plugins/check_http.c:797 +#: plugins/check_http.c:815 #, fuzzy, c-format msgid "%sDocument date \"%100s\" unparsable, " msgstr "" "HTTP CRITICAL - Dokumentendatum \"%100s\" konnte nicht verarbeitet werden" -#: plugins/check_http.c:800 +#: plugins/check_http.c:818 #, fuzzy, c-format msgid "%sDocument is %d seconds in the future, " msgstr "HTTP CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" -#: plugins/check_http.c:805 +#: plugins/check_http.c:823 #, fuzzy, c-format msgid "%sLast modified %.1f days ago, " msgstr "HTTP CRITICAL - Letzte Änderung vor %.1f Tagen\n" -#: plugins/check_http.c:808 +#: plugins/check_http.c:826 #, fuzzy, c-format msgid "%sLast modified %d:%02d:%02d ago, " msgstr "HTTP CRITICAL - Letzte Änderung vor %d:%02d:%02d \n" -#: plugins/check_http.c:922 +#: plugins/check_http.c:940 msgid "HTTP CRITICAL - Unable to open TCP socket\n" msgstr "HTTP CRITICAL - Konnte TCP socket nicht öffnen\n" -#: plugins/check_http.c:1106 +#: plugins/check_http.c:1126 msgid "HTTP CRITICAL - Error on receive\n" msgstr "HTTP CRITICAL - Fehler beim Empfangen\n" -#: plugins/check_http.c:1116 +#: plugins/check_http.c:1136 #, fuzzy msgid "HTTP CRITICAL - No data received from host\n" msgstr "HTTP CRITICAL - Keine Daten empfangen\n" -#: plugins/check_http.c:1167 +#: plugins/check_http.c:1187 #, fuzzy, c-format msgid "Invalid HTTP response received from host: %s\n" msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_http.c:1171 +#: plugins/check_http.c:1191 #, fuzzy, c-format msgid "Invalid HTTP response received from host on port %d: %s\n" msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" -#: plugins/check_http.c:1174 plugins/check_http.c:1326 +#: plugins/check_http.c:1194 plugins/check_http.c:1346 #, c-format msgid "" "%s\n" "%s" msgstr "" -#: plugins/check_http.c:1182 +#: plugins/check_http.c:1202 #, fuzzy, c-format msgid "Status line output matched \"%s\" - " msgstr "HTTP OK: Statusausgabe passt auf \"%s\"\n" -#: plugins/check_http.c:1193 +#: plugins/check_http.c:1213 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "HTTP CRITICAL: Ungültige Statusmeldung (%s)\n" -#: plugins/check_http.c:1200 +#: plugins/check_http.c:1220 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "HTTP CRITICAL: Ungültiger Status (%s)\n" -#: plugins/check_http.c:1204 plugins/check_http.c:1209 -#: plugins/check_http.c:1219 plugins/check_http.c:1223 +#: plugins/check_http.c:1224 plugins/check_http.c:1229 +#: plugins/check_http.c:1239 plugins/check_http.c:1243 #, c-format msgid "%s - " msgstr "" -#: plugins/check_http.c:1242 +#: plugins/check_http.c:1262 #, fuzzy, c-format msgid "%sheader '%s' not found on '%s://%s:%d%s', " msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1254 +#: plugins/check_http.c:1274 #, fuzzy, c-format msgid "%sstring '%s' not found on '%s://%s:%d%s', " msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1267 +#: plugins/check_http.c:1287 #, fuzzy, c-format msgid "%spattern not found, " msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1269 +#: plugins/check_http.c:1289 #, fuzzy, c-format msgid "%spattern found, " msgstr "CRITICAL - Muster nicht gefunden%s|%s %s\n" -#: plugins/check_http.c:1275 +#: plugins/check_http.c:1295 #, fuzzy, c-format msgid "%sExecute Error: %s, " msgstr "HTTP CRITICAL - Fehler: %s\n" -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1311 #, fuzzy, c-format msgid "%spage size %d too large, " msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1314 #, fuzzy, c-format msgid "%spage size %d too small, " msgstr "HTTP WARNING: Seitengröße %d zu klein%s|%s\n" -#: plugins/check_http.c:1307 +#: plugins/check_http.c:1327 #, fuzzy, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:1319 +#: plugins/check_http.c:1339 #, fuzzy, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s" msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_http.c:1360 +#: plugins/check_http.c:1382 msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "HTTP UNKNOWN - Konnte addr nicht zuweisen\n" -#: plugins/check_http.c:1365 plugins/check_http.c:1396 +#: plugins/check_http.c:1387 plugins/check_http.c:1418 #, fuzzy msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "HTTP UNKNOWN - Konnte·url·nicht·zuweisen\n" -#: plugins/check_http.c:1374 +#: plugins/check_http.c:1396 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1389 +#: plugins/check_http.c:1411 #, fuzzy, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "HTTP UNKNOWN - Serverdatum unbekannt\n" -#: plugins/check_http.c:1439 +#: plugins/check_http.c:1473 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1483 #, fuzzy, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1457 -#, c-format -msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +#: plugins/check_http.c:1491 +#, fuzzy, c-format +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1512 #, fuzzy, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "HTTP WARNING - Umleitung verursacht eine Schleife - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1520 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "" -#: plugins/check_http.c:1561 +#: plugins/check_http.c:1595 #, fuzzy msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1596 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1597 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1598 #, fuzzy msgid "certificate expiration times." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1605 #, c-format msgid "In the first form, make an HTTP request." msgstr "" -#: plugins/check_http.c:1572 +#: plugins/check_http.c:1606 #, c-format msgid "" "In the second form, connect to the server and check the TLS certificate." msgstr "" -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1608 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1582 +#: plugins/check_http.c:1616 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1583 +#: plugins/check_http.c:1617 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1585 +#: plugins/check_http.c:1619 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1587 +#: plugins/check_http.c:1621 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1594 +#: plugins/check_http.c:1628 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1595 +#: plugins/check_http.c:1629 msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," msgstr "" -#: plugins/check_http.c:1596 +#: plugins/check_http.c:1630 msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." msgstr "" -#: plugins/check_http.c:1598 +#: plugins/check_http.c:1632 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1600 +#: plugins/check_http.c:1634 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1601 -msgid "(when this option is used the URL is not checked.)" +#: plugins/check_http.c:1635 +msgid "" +"(when this option is used the URL is not checked by default. You can use" msgstr "" -#: plugins/check_http.c:1603 +#: plugins/check_http.c:1636 +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +#: plugins/check_http.c:1638 +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +#: plugins/check_http.c:1639 +msgid "Does nothing unless -C is used." +msgstr "" + +#: plugins/check_http.c:1641 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1604 +#: plugins/check_http.c:1642 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1606 +#: plugins/check_http.c:1644 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1607 +#: plugins/check_http.c:1645 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1611 +#: plugins/check_http.c:1649 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" -#: plugins/check_http.c:1612 +#: plugins/check_http.c:1650 msgid "the first (status) line of the server response (default: " msgstr "" -#: plugins/check_http.c:1614 +#: plugins/check_http.c:1652 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1616 +#: plugins/check_http.c:1654 msgid "String to expect in the response headers" msgstr "" -#: plugins/check_http.c:1618 +#: plugins/check_http.c:1656 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1620 +#: plugins/check_http.c:1658 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1622 +#: plugins/check_http.c:1660 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1624 +#: plugins/check_http.c:1662 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1626 +#: plugins/check_http.c:1664 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1627 +#: plugins/check_http.c:1665 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1629 +#: plugins/check_http.c:1667 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1630 +#: plugins/check_http.c:1668 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1632 +#: plugins/check_http.c:1670 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1635 +#: plugins/check_http.c:1673 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1637 +#: plugins/check_http.c:1675 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1639 +#: plugins/check_http.c:1677 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1641 +#: plugins/check_http.c:1679 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1644 +#: plugins/check_http.c:1682 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1646 +#: plugins/check_http.c:1684 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1648 +#: plugins/check_http.c:1686 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1650 +#: plugins/check_http.c:1688 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1652 +#: plugins/check_http.c:1690 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1654 +#: plugins/check_http.c:1692 msgid "Print body content below status line" msgstr "" -#: plugins/check_http.c:1656 +#: plugins/check_http.c:1694 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1658 +#: plugins/check_http.c:1696 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1659 +#: plugins/check_http.c:1697 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1661 +#: plugins/check_http.c:1699 +#, fuzzy +msgid "Maximal number of redirects (default: " +msgstr "Ungültige Portnummer" + +#: plugins/check_http.c:1702 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1671 +#: plugins/check_http.c:1711 #, fuzzy msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_http.c:1672 +#: plugins/check_http.c:1712 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1673 +#: plugins/check_http.c:1713 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "response" msgstr "" -#: plugins/check_http.c:1674 +#: plugins/check_http.c:1714 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1675 +#: plugins/check_http.c:1715 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1676 +#: plugins/check_http.c:1716 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1680 +#: plugins/check_http.c:1720 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1681 +#: plugins/check_http.c:1721 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1682 +#: plugins/check_http.c:1722 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1684 +#: plugins/check_http.c:1724 #, fuzzy msgid "Please note that this plugin does not check if the presented server" msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_http.c:1685 +#: plugins/check_http.c:1725 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1686 +#: plugins/check_http.c:1726 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1690 +#: plugins/check_http.c:1730 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1691 plugins/check_http.c:1710 +#: plugins/check_http.c:1731 plugins/check_http.c:1750 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1692 plugins/check_http.c:1711 +#: plugins/check_http.c:1732 plugins/check_http.c:1751 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1693 +#: plugins/check_http.c:1733 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1696 +#: plugins/check_http.c:1736 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1697 plugins/check_http.c:1703 +#: plugins/check_http.c:1737 plugins/check_http.c:1743 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1698 +#: plugins/check_http.c:1738 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1699 +#: plugins/check_http.c:1739 #, fuzzy msgid "the certificate is expired." msgstr "Clientzertifikat benötigt\n" -#: plugins/check_http.c:1702 +#: plugins/check_http.c:1742 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1704 +#: plugins/check_http.c:1744 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1705 +#: plugins/check_http.c:1745 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" msgstr "" -#: plugins/check_http.c:1708 +#: plugins/check_http.c:1748 msgid "" "check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " "CONNECT -H www.verisign.com " msgstr "" -#: plugins/check_http.c:1709 +#: plugins/check_http.c:1749 msgid "" -"all these options are needed: -I -p -u -S" -"(sl) -j CONNECT -H " +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " msgstr "" -#: plugins/check_http.c:1712 +#: plugins/check_http.c:1752 msgid "" "a STATE_CRITICAL will be returned. By adding a colon to the method you can " "set the method used" msgstr "" -#: plugins/check_http.c:1713 +#: plugins/check_http.c:1753 msgid "inside the proxied connection: -j CONNECT:POST" msgstr "" @@ -1823,165 +1875,167 @@ msgstr "" msgid "Please specify the LDAP base\n" msgstr "" -#: plugins/check_ldap.c:462 +#: plugins/check_ldap.c:465 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:464 +#: plugins/check_ldap.c:467 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:466 +#: plugins/check_ldap.c:469 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:468 -msgid "ldap password (if required)" +#: plugins/check_ldap.c:471 +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" msgstr "" -#: plugins/check_ldap.c:470 +#: plugins/check_ldap.c:473 msgid "use starttls mechanism introduced in protocol version 3" msgstr "" -#: plugins/check_ldap.c:472 +#: plugins/check_ldap.c:475 msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" msgstr "" -#: plugins/check_ldap.c:476 +#: plugins/check_ldap.c:479 msgid "use ldap protocol version 2" msgstr "" -#: plugins/check_ldap.c:478 +#: plugins/check_ldap.c:481 msgid "use ldap protocol version 3" msgstr "" -#: plugins/check_ldap.c:479 +#: plugins/check_ldap.c:482 msgid "default protocol version:" msgstr "" -#: plugins/check_ldap.c:485 +#: plugins/check_ldap.c:488 msgid "Number of found entries to result in warning status" msgstr "" -#: plugins/check_ldap.c:487 +#: plugins/check_ldap.c:490 msgid "Number of found entries to result in critical status" msgstr "" -#: plugins/check_ldap.c:495 +#: plugins/check_ldap.c:498 msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" msgstr "" -#: plugins/check_ldap.c:496 +#: plugins/check_ldap.c:499 #, c-format msgid "" " implied (using default port %i) unless --port=636 is specified. In that " "case\n" msgstr "" -#: plugins/check_ldap.c:497 +#: plugins/check_ldap.c:500 msgid "'SSL on connect' will be used no matter how the plugin was called." msgstr "" -#: plugins/check_ldap.c:498 +#: plugins/check_ldap.c:501 msgid "" "This detection is deprecated, please use 'check_ldap' with the '--starttls' " "or '--ssl' flags" msgstr "" -#: plugins/check_ldap.c:499 +#: plugins/check_ldap.c:502 msgid "to define the behaviour explicitly instead." msgstr "" -#: plugins/check_ldap.c:500 +#: plugins/check_ldap.c:503 msgid "The parameters --warn-entries and --crit-entries are optional." msgstr "" -#: plugins/check_load.c:91 +#: plugins/check_load.c:93 msgid "Warning threshold must be float or float triplet!\n" msgstr "" -#: plugins/check_load.c:136 plugins/check_load.c:152 +#: plugins/check_load.c:138 plugins/check_load.c:154 #, c-format msgid "Error opening %s\n" msgstr "" -#: plugins/check_load.c:167 +#: plugins/check_load.c:169 #, fuzzy, c-format -msgid "could not parse load from uptime %s: %s\n" +msgid "could not parse load from uptime %s: %d\n" msgstr "Argumente konnten nicht ausgewertet werden" -#: plugins/check_load.c:173 +#: plugins/check_load.c:175 #, c-format msgid "Error code %d returned in %s\n" msgstr "" -#: plugins/check_load.c:188 +#: plugins/check_load.c:183 #, c-format msgid "Error in getloadavg()\n" msgstr "" -#: plugins/check_load.c:191 plugins/check_load.c:193 +#: plugins/check_load.c:186 plugins/check_load.c:188 #, c-format msgid "Error processing %s\n" msgstr "" -#: plugins/check_load.c:202 +#: plugins/check_load.c:197 plugins/check_load.c:212 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "" -#: plugins/check_load.c:302 +#: plugins/check_load.c:327 #, fuzzy, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "Critical threshold muss ein positiver Integer sein\n" -#: plugins/check_load.c:304 +#: plugins/check_load.c:329 #, fuzzy, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "Warning threshold muss ein positiver Integer sein\n" -#: plugins/check_load.c:306 +#: plugins/check_load.c:331 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " "\"critical load\"\n" msgstr "" -#: plugins/check_load.c:322 +#: plugins/check_load.c:346 #, c-format msgid "This plugin tests the current system load average." msgstr "" -#: plugins/check_load.c:332 +#: plugins/check_load.c:356 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" -#: plugins/check_load.c:334 +#: plugins/check_load.c:358 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "" -#: plugins/check_load.c:335 +#: plugins/check_load.c:359 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" -#: plugins/check_load.c:337 +#: plugins/check_load.c:361 msgid "Divide the load averages by the number of CPUs (when possible)" msgstr "" -#: plugins/check_load.c:339 +#: plugins/check_load.c:363 msgid "Number of processes to show when printing the top consuming processes." msgstr "" -#: plugins/check_load.c:340 +#: plugins/check_load.c:364 msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" msgstr "" -#: plugins/check_load.c:377 +#: plugins/check_load.c:401 #, c-format msgid "'%s' exited with non-zero status.\n" msgstr "" -#: plugins/check_load.c:381 +#: plugins/check_load.c:405 #, c-format msgid "some error occurred getting procs list.\n" msgstr "" @@ -3608,413 +3662,426 @@ msgid "" "higher than the warning threshold value, EXCEPT with the uptime variable" msgstr "" -#: plugins/check_pgsql.c:223 +#: plugins/check_pgsql.c:225 #, c-format msgid "CRITICAL - no connection to '%s' (%s).\n" msgstr "" -#: plugins/check_pgsql.c:251 +#: plugins/check_pgsql.c:253 #, c-format msgid " %s - database %s (%f sec.)|%s\n" msgstr "" -#: plugins/check_pgsql.c:318 plugins/check_time.c:277 plugins/check_time.c:289 +#: plugins/check_pgsql.c:321 plugins/check_time.c:277 plugins/check_time.c:289 #: plugins/check_users.c:228 msgid "Critical threshold must be a positive integer" msgstr "Critical threshold muss ein positiver Integer sein" -#: plugins/check_pgsql.c:324 plugins/check_time.c:258 plugins/check_time.c:282 +#: plugins/check_pgsql.c:327 plugins/check_time.c:258 plugins/check_time.c:282 #: plugins/check_users.c:226 msgid "Warning threshold must be a positive integer" msgstr "Warning threshold muss ein positiver Integer sein" -#: plugins/check_pgsql.c:348 +#: plugins/check_pgsql.c:351 msgid "Database name is not valid" msgstr "" -#: plugins/check_pgsql.c:354 +#: plugins/check_pgsql.c:357 msgid "User name is not valid" msgstr "" -#: plugins/check_pgsql.c:505 +#: plugins/check_pgsql.c:511 #, c-format msgid "Test whether a PostgreSQL Database is accepting connections." msgstr "" -#: plugins/check_pgsql.c:517 +#: plugins/check_pgsql.c:523 msgid "Database to check " msgstr "" -#: plugins/check_pgsql.c:518 +#: plugins/check_pgsql.c:524 #, c-format msgid "(default: %s)\n" msgstr "" -#: plugins/check_pgsql.c:520 +#: plugins/check_pgsql.c:526 msgid "Login name of user" msgstr "" -#: plugins/check_pgsql.c:522 +#: plugins/check_pgsql.c:528 msgid "Password (BIG SECURITY ISSUE)" msgstr "" -#: plugins/check_pgsql.c:524 +#: plugins/check_pgsql.c:530 msgid "Connection parameters (keyword = value), see below" msgstr "" -#: plugins/check_pgsql.c:531 +#: plugins/check_pgsql.c:537 msgid "SQL query to run. Only first column in first row will be read" msgstr "" -#: plugins/check_pgsql.c:533 -msgid "SQL query value to result in warning status (double)" -msgstr "" - -#: plugins/check_pgsql.c:535 -msgid "SQL query value to result in critical status (double)" +#: plugins/check_pgsql.c:539 +msgid "A name for the query, this string is used instead of the query" msgstr "" #: plugins/check_pgsql.c:540 +msgid "in the long output of the plugin" +msgstr "" + +#: plugins/check_pgsql.c:542 +msgid "SQL query value to result in warning status (double)" +msgstr "" + +#: plugins/check_pgsql.c:544 +msgid "SQL query value to result in critical status (double)" +msgstr "" + +#: plugins/check_pgsql.c:549 msgid "All parameters are optional." msgstr "" -#: plugins/check_pgsql.c:541 +#: plugins/check_pgsql.c:550 msgid "" "This plugin tests a PostgreSQL DBMS to determine whether it is active and" msgstr "" -#: plugins/check_pgsql.c:542 +#: plugins/check_pgsql.c:551 msgid "accepting queries. In its current operation, it simply connects to the" msgstr "" -#: plugins/check_pgsql.c:543 +#: plugins/check_pgsql.c:552 msgid "" "specified database, and then disconnects. If no database is specified, it" msgstr "" -#: plugins/check_pgsql.c:544 +#: plugins/check_pgsql.c:553 msgid "" "connects to the template1 database, which is present in every functioning" msgstr "" -#: plugins/check_pgsql.c:545 +#: plugins/check_pgsql.c:554 msgid "PostgreSQL DBMS." msgstr "" -#: plugins/check_pgsql.c:547 +#: plugins/check_pgsql.c:556 msgid "If a query is specified using the -q option, it will be executed after" msgstr "" -#: plugins/check_pgsql.c:548 -msgid "connecting to the server. The result from the query has to be numeric." -msgstr "" - -#: plugins/check_pgsql.c:549 -msgid "" -"Multiple SQL commands, separated by semicolon, are allowed but the result " -msgstr "" - -#: plugins/check_pgsql.c:550 -msgid "of the last command is taken into account only. The value of the first" -msgstr "" - -#: plugins/check_pgsql.c:551 -msgid "column in the first row is used as the check result." -msgstr "" - -#: plugins/check_pgsql.c:553 -msgid "" -"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" -msgstr "" - -#: plugins/check_pgsql.c:554 -msgid "" -"for details about how to access internal statistics of the database server." -msgstr "" - -#: plugins/check_pgsql.c:556 -msgid "" -"For a list of available connection parameters which may be used with the -o" -msgstr "" - #: plugins/check_pgsql.c:557 -msgid "" -"command line option, see the documentation for PQconnectdb() in the chapter" +msgid "connecting to the server. The result from the query has to be numeric." msgstr "" #: plugins/check_pgsql.c:558 msgid "" -"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +"Multiple SQL commands, separated by semicolon, are allowed but the result " msgstr "" #: plugins/check_pgsql.c:559 -msgid "" -"used to specify a service name in pg_service.conf to be used for additional" +msgid "of the last command is taken into account only. The value of the first" msgstr "" #: plugins/check_pgsql.c:560 -msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgid "column in the first row is used as the check result." msgstr "" -#: plugins/check_pgsql.c:561 -msgid "-o 'sslmode=require'." +#: plugins/check_pgsql.c:562 +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" msgstr "" #: plugins/check_pgsql.c:563 msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +#: plugins/check_pgsql.c:565 +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +#: plugins/check_pgsql.c:566 +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +#: plugins/check_pgsql.c:567 +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +#: plugins/check_pgsql.c:568 +msgid "" +"used to specify a service name in pg_service.conf to be used for additional" +msgstr "" + +#: plugins/check_pgsql.c:569 +msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgstr "" + +#: plugins/check_pgsql.c:570 +msgid "-o 'sslmode=require'." +msgstr "" + +#: plugins/check_pgsql.c:572 +msgid "" "The plugin will connect to a local postmaster if no host is specified. To" msgstr "" -#: plugins/check_pgsql.c:564 +#: plugins/check_pgsql.c:573 msgid "" "connect to a remote host, be sure that the remote postmaster accepts TCP/IP" msgstr "" -#: plugins/check_pgsql.c:565 +#: plugins/check_pgsql.c:574 msgid "connections (start the postmaster with the -i option)." msgstr "" -#: plugins/check_pgsql.c:567 +#: plugins/check_pgsql.c:576 msgid "" "Typically, the monitoring user (unless the --logname option is used) should " "be" msgstr "" -#: plugins/check_pgsql.c:568 +#: plugins/check_pgsql.c:577 msgid "" "able to connect to the database without a password. The plugin can also send" msgstr "" -#: plugins/check_pgsql.c:569 +#: plugins/check_pgsql.c:578 msgid "a password, but no effort is made to obscure or encrypt the password." msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 #, c-format msgid "QUERY %s - %s: %s.\n" msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 msgid "Error with query" msgstr "" -#: plugins/check_pgsql.c:608 +#: plugins/check_pgsql.c:617 msgid "No rows returned" msgstr "" -#: plugins/check_pgsql.c:613 +#: plugins/check_pgsql.c:622 msgid "No columns returned" msgstr "" -#: plugins/check_pgsql.c:619 +#: plugins/check_pgsql.c:628 #, fuzzy msgid "No data returned" msgstr "Keine Daten empfangen %s\n" -#: plugins/check_pgsql.c:628 +#: plugins/check_pgsql.c:637 msgid "Is not a numeric" msgstr "" -#: plugins/check_pgsql.c:645 +#: plugins/check_pgsql.c:655 +#, fuzzy, c-format +msgid "%s returned %f" +msgstr "%s hat %s zurückgegeben" + +#: plugins/check_pgsql.c:658 #, fuzzy, c-format msgid "'%s' returned %f" msgstr "%s hat %s zurückgegeben" -#: plugins/check_ping.c:141 +#: plugins/check_ping.c:143 msgid "CRITICAL - Could not interpret output from ping command\n" msgstr "" -#: plugins/check_ping.c:157 +#: plugins/check_ping.c:159 #, c-format msgid "PING %s - %sPacket loss = %d%%" msgstr "" -#: plugins/check_ping.c:160 +#: plugins/check_ping.c:162 #, c-format msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" msgstr "" -#: plugins/check_ping.c:257 +#: plugins/check_ping.c:263 msgid "Could not realloc() addresses\n" msgstr "" -#: plugins/check_ping.c:272 plugins/check_ping.c:352 +#: plugins/check_ping.c:278 plugins/check_ping.c:358 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:306 +#: plugins/check_ping.c:312 #, c-format msgid " (%s) must be an integer percentage\n" msgstr "" -#: plugins/check_ping.c:317 +#: plugins/check_ping.c:323 #, c-format msgid " (%s) must be an integer percentage\n" msgstr "" -#: plugins/check_ping.c:328 +#: plugins/check_ping.c:334 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:339 +#: plugins/check_ping.c:345 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:372 +#: plugins/check_ping.c:378 #, c-format msgid "" "%s: Warning threshold must be integer or percentage!\n" "\n" msgstr "" -#: plugins/check_ping.c:385 +#: plugins/check_ping.c:391 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:389 +#: plugins/check_ping.c:395 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:393 +#: plugins/check_ping.c:399 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:397 +#: plugins/check_ping.c:403 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:401 +#: plugins/check_ping.c:407 #, c-format msgid " (%f) cannot be larger than (%f)\n" msgstr "" -#: plugins/check_ping.c:405 +#: plugins/check_ping.c:411 #, c-format msgid " (%d) cannot be larger than (%d)\n" msgstr "" -#: plugins/check_ping.c:442 +#: plugins/check_ping.c:448 #, c-format msgid "Cannot open stderr for %s\n" msgstr "" -#: plugins/check_ping.c:499 plugins/check_ping.c:501 +#: plugins/check_ping.c:505 plugins/check_ping.c:507 msgid "System call sent warnings to stderr " msgstr "" -#: plugins/check_ping.c:526 +#: plugins/check_ping.c:533 #, fuzzy, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:528 +#: plugins/check_ping.c:535 #, fuzzy, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:530 +#: plugins/check_ping.c:537 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:532 +#: plugins/check_ping.c:539 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:534 +#: plugins/check_ping.c:541 #, fuzzy, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:536 +#: plugins/check_ping.c:543 #, fuzzy, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:538 +#: plugins/check_ping.c:545 #, fuzzy, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:540 +#: plugins/check_ping.c:547 #, fuzzy, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "CRITICAL - Text nicht gefunden%s|%s %s\n" -#: plugins/check_ping.c:542 +#: plugins/check_ping.c:549 #, fuzzy, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 #, fuzzy, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "CRITICAL - Netzwerk nicht erreichbar (%s)" -#: plugins/check_ping.c:551 +#: plugins/check_ping.c:558 msgid "Unable to realloc warn_text\n" msgstr "" -#: plugins/check_ping.c:568 +#: plugins/check_ping.c:575 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 msgid "host to ping" msgstr "" -#: plugins/check_ping.c:586 +#: plugins/check_ping.c:593 msgid "number of ICMP ECHO packets to send" msgstr "" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 #, c-format msgid "(Default: %d)\n" msgstr "" -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "" -#: plugins/check_ping.c:596 +#: plugins/check_ping.c:603 msgid "percentage of packet loss to trigger an alarm state." msgstr "" -#: plugins/check_ping.c:599 +#: plugins/check_ping.c:606 #, fuzzy msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_ping.c:600 +#: plugins/check_ping.c:607 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:601 +#: plugins/check_ping.c:608 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:602 +#: plugins/check_ping.c:609 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" @@ -4254,8 +4321,7 @@ msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" #: plugins/check_procs.c:778 -#, c-format -msgid "Alert if CPU of any processes over 10%% or 20%%" +msgid "Alert if CPU of any processes over 10% or 20%" msgstr "" #: plugins/check_radius.c:177 @@ -4272,7 +4338,7 @@ msgstr "Kein Papier" msgid "Invalid NAS-Identifier\n" msgstr "Ungültige(r) Hostname/Adresse" -#: plugins/check_radius.c:195 plugins/check_smtp.c:151 +#: plugins/check_radius.c:195 plugins/check_smtp.c:153 #, c-format msgid "gethostname() failed!\n" msgstr "" @@ -4430,11 +4496,11 @@ msgstr "" msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:337 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:539 msgid "Warning time must be a positive integer" msgstr "Warnung time muss ein positiver Integer sein" -#: plugins/check_real.c:346 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:530 msgid "Critical time must be a positive integer" msgstr "Critical time muss ein positiver Integer sein" @@ -4464,7 +4530,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_real.c:439 plugins/check_smtp.c:837 +#: plugins/check_real.c:439 plugins/check_smtp.c:847 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -4482,530 +4548,571 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:147 plugins/check_swap.c:266 plugins/check_swap.c:272 +#: plugins/check_smtp.c:149 plugins/check_swap.c:286 plugins/check_swap.c:292 #, c-format msgid "malloc() failed!\n" msgstr "" -#: plugins/check_smtp.c:186 plugins/check_smtp.c:198 +#: plugins/check_smtp.c:190 plugins/check_smtp.c:202 #, c-format msgid "recv() failed\n" msgstr "" -#: plugins/check_smtp.c:208 +#: plugins/check_smtp.c:212 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "" -#: plugins/check_smtp.c:220 +#: plugins/check_smtp.c:224 #, c-format msgid "Server does not support STARTTLS\n" msgstr "" -#: plugins/check_smtp.c:226 +#: plugins/check_smtp.c:230 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "" -#: plugins/check_smtp.c:246 +#: plugins/check_smtp.c:250 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:251 +#: plugins/check_smtp.c:255 #, c-format msgid "sent %s" msgstr "" -#: plugins/check_smtp.c:253 +#: plugins/check_smtp.c:257 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:283 +#: plugins/check_smtp.c:287 #, fuzzy, c-format msgid "Invalid SMTP response received from host: %s\n" msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:285 +#: plugins/check_smtp.c:289 #, fuzzy, c-format msgid "Invalid SMTP response received from host on port %d: %s\n" msgstr "Ungültige HTTP Antwort von Host erhalten auf Port %d\n" -#: plugins/check_smtp.c:308 plugins/check_snmp.c:834 +#: plugins/check_smtp.c:312 plugins/check_snmp.c:855 #, c-format msgid "Could Not Compile Regular Expression" msgstr "" -#: plugins/check_smtp.c:317 +#: plugins/check_smtp.c:321 #, c-format msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "" -#: plugins/check_smtp.c:321 plugins/check_snmp.c:520 +#: plugins/check_smtp.c:325 plugins/check_snmp.c:532 #, c-format msgid "Execute Error: %s\n" msgstr "" -#: plugins/check_smtp.c:335 +#: plugins/check_smtp.c:339 msgid "no authuser specified, " msgstr "" -#: plugins/check_smtp.c:340 +#: plugins/check_smtp.c:344 msgid "no authpass specified, " msgstr "" -#: plugins/check_smtp.c:347 plugins/check_smtp.c:368 plugins/check_smtp.c:388 -#: plugins/check_smtp.c:693 +#: plugins/check_smtp.c:351 plugins/check_smtp.c:372 plugins/check_smtp.c:392 +#: plugins/check_smtp.c:701 #, c-format msgid "sent %s\n" msgstr "" -#: plugins/check_smtp.c:350 +#: plugins/check_smtp.c:354 #, fuzzy msgid "recv() failed after AUTH LOGIN, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:355 plugins/check_smtp.c:376 plugins/check_smtp.c:396 -#: plugins/check_smtp.c:704 +#: plugins/check_smtp.c:359 plugins/check_smtp.c:380 plugins/check_smtp.c:400 +#: plugins/check_smtp.c:712 #, fuzzy, c-format msgid "received %s\n" msgstr "Keine Daten empfangen %s\n" -#: plugins/check_smtp.c:359 +#: plugins/check_smtp.c:363 #, fuzzy msgid "invalid response received after AUTH LOGIN, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:372 +#: plugins/check_smtp.c:376 msgid "recv() failed after sending authuser, " msgstr "" -#: plugins/check_smtp.c:380 +#: plugins/check_smtp.c:384 #, fuzzy msgid "invalid response received after authuser, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:392 +#: plugins/check_smtp.c:396 msgid "recv() failed after sending authpass, " msgstr "" -#: plugins/check_smtp.c:400 +#: plugins/check_smtp.c:404 #, fuzzy msgid "invalid response received after authpass, " msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:407 +#: plugins/check_smtp.c:411 msgid "only authtype LOGIN is supported, " msgstr "" -#: plugins/check_smtp.c:431 +#: plugins/check_smtp.c:435 #, fuzzy, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr " - %s - %.3f Sekunden Antwortzeit %s%s|%s %s\n" -#: plugins/check_smtp.c:541 plugins/check_smtp.c:553 +#: plugins/check_smtp.c:546 plugins/check_smtp.c:558 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "" -#: plugins/check_smtp.c:561 +#: plugins/check_smtp.c:566 #, fuzzy msgid "Critical time must be a positive" msgstr "Critical time muss ein positiver Integer sein" -#: plugins/check_smtp.c:569 +#: plugins/check_smtp.c:574 #, fuzzy msgid "Warning time must be a positive" msgstr "Warnung time muss ein positiver Integer sein" -#: plugins/check_smtp.c:612 +#: plugins/check_smtp.c:617 msgid "SSL support not available - install OpenSSL and recompile" msgstr "" -#: plugins/check_smtp.c:684 plugins/check_smtp.c:689 +#: plugins/check_smtp.c:692 plugins/check_smtp.c:697 #, c-format msgid "Connection closed by server before sending QUIT command\n" msgstr "" -#: plugins/check_smtp.c:699 +#: plugins/check_smtp.c:707 #, fuzzy, c-format msgid "recv() failed after QUIT." msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_smtp.c:701 +#: plugins/check_smtp.c:709 #, c-format msgid "Connection reset by peer." msgstr "" -#: plugins/check_smtp.c:791 +#: plugins/check_smtp.c:799 #, fuzzy msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host." -#: plugins/check_smtp.c:805 +#: plugins/check_smtp.c:813 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" -#: plugins/check_smtp.c:807 +#: plugins/check_smtp.c:815 msgid "SMTP command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:809 +#: plugins/check_smtp.c:817 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:811 +#: plugins/check_smtp.c:819 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:813 +#: plugins/check_smtp.c:821 msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:816 plugins/check_tcp.c:689 +#: plugins/check_smtp.c:824 plugins/check_tcp.c:689 msgid "Minimum number of days a certificate has to be valid." msgstr "" -#: plugins/check_smtp.c:818 +#: plugins/check_smtp.c:826 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:822 +#: plugins/check_smtp.c:830 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:824 +#: plugins/check_smtp.c:832 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:826 +#: plugins/check_smtp.c:834 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:828 -msgid "Ignore failure when sending QUIT command to server" +#: plugins/check_smtp.c:836 +msgid "Send LHLO instead of HELO/EHLO" msgstr "" #: plugins/check_smtp.c:838 +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +#: plugins/check_smtp.c:848 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:839 +#: plugins/check_smtp.c:849 msgid "connects, but incorrect response messages from the host result in" msgstr "" -#: plugins/check_smtp.c:840 +#: plugins/check_smtp.c:850 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:171 plugins/check_snmp.c:604 +#: plugins/check_snmp.c:172 plugins/check_snmp.c:618 msgid "Cannot malloc" msgstr "" -#: plugins/check_snmp.c:362 +#: plugins/check_snmp.c:363 #, fuzzy, c-format msgid "External command error: %s\n" msgstr "Papierfehler" -#: plugins/check_snmp.c:367 +#: plugins/check_snmp.c:368 #, c-format msgid "External command error with no output (return code: %d)\n" msgstr "" -#: plugins/check_snmp.c:473 +#: plugins/check_snmp.c:478 plugins/check_snmp.c:480 plugins/check_snmp.c:482 +#: plugins/check_snmp.c:484 #, fuzzy, c-format msgid "No valid data returned (%s)\n" msgstr "Keine Daten empfangen %s\n" -#: plugins/check_snmp.c:484 +#: plugins/check_snmp.c:496 msgid "Time duration between plugin calls is invalid" msgstr "" -#: plugins/check_snmp.c:610 +#: plugins/check_snmp.c:624 msgid "Cannot asprintf()" msgstr "" -#: plugins/check_snmp.c:616 +#: plugins/check_snmp.c:630 msgid "Cannot realloc()" msgstr "" -#: plugins/check_snmp.c:632 +#: plugins/check_snmp.c:646 msgid "No previous data to calculate rate - assume okay" msgstr "" -#: plugins/check_snmp.c:779 +#: plugins/check_snmp.c:794 #, fuzzy msgid "Retries interval must be a positive integer" msgstr "Time interval muss ein positiver Integer sein" -#: plugins/check_snmp.c:859 +#: plugins/check_snmp.c:831 +#, fuzzy +msgid "Exit status must be a positive integer" +msgstr "Maxbytes muss ein positiver Integer sein" + +#: plugins/check_snmp.c:880 #, fuzzy, c-format msgid "Could not reallocate labels[%d]" msgstr "Konnte addr nicht zuweisen\n" -#: plugins/check_snmp.c:872 +#: plugins/check_snmp.c:893 #, fuzzy msgid "Could not reallocate labels\n" msgstr "Konnte·url·nicht·zuweisen\n" -#: plugins/check_snmp.c:888 +#: plugins/check_snmp.c:909 #, fuzzy, c-format msgid "Could not reallocate units [%d]\n" msgstr "Konnte·url·nicht·zuweisen\n" -#: plugins/check_snmp.c:900 +#: plugins/check_snmp.c:921 msgid "Could not realloc() units\n" msgstr "" -#: plugins/check_snmp.c:917 +#: plugins/check_snmp.c:938 #, fuzzy msgid "Rate multiplier must be a positive integer" msgstr "Paketgröße muss ein positiver Integer sein" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:1003 #, fuzzy msgid "No host specified\n" msgstr "" "Kein Hostname angegeben\n" "\n" -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:1007 #, fuzzy msgid "No OIDs specified\n" msgstr "" "Kein Hostname angegeben\n" "\n" -#: plugins/check_snmp.c:1009 plugins/check_snmp.c:1027 -#: plugins/check_snmp.c:1045 +#: plugins/check_snmp.c:1030 plugins/check_snmp.c:1048 +#: plugins/check_snmp.c:1066 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1020 +#: plugins/check_snmp.c:1041 msgid "Invalid seclevel" msgstr "" -#: plugins/check_snmp.c:1066 +#: plugins/check_snmp.c:1087 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:1083 +#: plugins/check_snmp.c:1104 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:1132 +#: plugins/check_snmp.c:1153 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" -#: plugins/check_snmp.c:1146 +#: plugins/check_snmp.c:1167 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:1148 +#: plugins/check_snmp.c:1169 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:1150 +#: plugins/check_snmp.c:1171 msgid "SNMPv3 context" msgstr "" -#: plugins/check_snmp.c:1152 +#: plugins/check_snmp.c:1173 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:1154 +#: plugins/check_snmp.c:1175 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:1156 +#: plugins/check_snmp.c:1177 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1160 +#: plugins/check_snmp.c:1181 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1182 msgid "default is" msgstr "" -#: plugins/check_snmp.c:1163 +#: plugins/check_snmp.c:1184 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1186 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:1167 +#: plugins/check_snmp.c:1188 msgid "SNMPv3 privacy password" msgstr "" -#: plugins/check_snmp.c:1171 +#: plugins/check_snmp.c:1192 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1194 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1195 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1176 +#: plugins/check_snmp.c:1197 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1177 +#: plugins/check_snmp.c:1198 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1178 +#: plugins/check_snmp.c:1199 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1182 +#: plugins/check_snmp.c:1201 +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +#: plugins/check_snmp.c:1202 +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +#: plugins/check_snmp.c:1203 +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +#: plugins/check_snmp.c:1204 +msgid "0 = OK" +msgstr "" + +#: plugins/check_snmp.c:1205 +#, fuzzy +msgid "1 = WARNING" +msgstr "WARNING" + +#: plugins/check_snmp.c:1206 +#, fuzzy +msgid "2 = CRITICAL" +msgstr "CRITICAL" + +#: plugins/check_snmp.c:1207 +#, fuzzy +msgid "3 = UNKNOWN" +msgstr "UNKNOWN" + +#: plugins/check_snmp.c:1211 #, fuzzy msgid "Warning threshold range(s)" msgstr "Warning threshold Integer sein" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1213 #, fuzzy msgid "Critical threshold range(s)" msgstr "Critical threshold muss ein Integer sein" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1215 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1188 +#: plugins/check_snmp.c:1217 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1219 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1223 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1225 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:1198 +#: plugins/check_snmp.c:1227 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:1200 +#: plugins/check_snmp.c:1229 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1204 +#: plugins/check_snmp.c:1233 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1206 +#: plugins/check_snmp.c:1235 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1208 +#: plugins/check_snmp.c:1237 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1211 +#: plugins/check_snmp.c:1240 msgid "" "NOTE the final timeout value is calculated using this formula: " "timeout_interval * retries + 5" msgstr "" -#: plugins/check_snmp.c:1213 +#: plugins/check_snmp.c:1242 msgid "Number of retries to be used in the requests, default: " msgstr "" -#: plugins/check_snmp.c:1216 +#: plugins/check_snmp.c:1245 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1221 +#: plugins/check_snmp.c:1250 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1222 +#: plugins/check_snmp.c:1251 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:1223 +#: plugins/check_snmp.c:1252 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:1227 +#: plugins/check_snmp.c:1256 msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" -#: plugins/check_snmp.c:1228 +#: plugins/check_snmp.c:1257 msgid "list (lists with internal spaces must be quoted)." msgstr "" -#: plugins/check_snmp.c:1232 +#: plugins/check_snmp.c:1261 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1233 +#: plugins/check_snmp.c:1262 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1234 +#: plugins/check_snmp.c:1263 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1235 +#: plugins/check_snmp.c:1264 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1238 +#: plugins/check_snmp.c:1267 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1239 +#: plugins/check_snmp.c:1268 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1240 +#: plugins/check_snmp.c:1269 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1241 +#: plugins/check_snmp.c:1270 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1242 +#: plugins/check_snmp.c:1271 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1243 +#: plugins/check_snmp.c:1272 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1244 +#: plugins/check_snmp.c:1273 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1245 +#: plugins/check_snmp.c:1274 msgid "changing the arguments will create a new state file." msgstr "" @@ -5048,107 +5155,115 @@ msgstr "" msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)" msgstr "" -#: plugins/check_swap.c:170 +#: plugins/check_swap.c:190 #, c-format msgid "Command: %s\n" msgstr "" -#: plugins/check_swap.c:172 +#: plugins/check_swap.c:192 #, c-format msgid "Format: %s\n" msgstr "" -#: plugins/check_swap.c:208 +#: plugins/check_swap.c:228 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:222 +#: plugins/check_swap.c:242 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:254 +#: plugins/check_swap.c:274 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:257 +#: plugins/check_swap.c:277 msgid "SWAP OK: No swap devices defined\n" msgstr "" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:298 plugins/check_swap.c:340 msgid "swapctl failed: " msgstr "" -#: plugins/check_swap.c:279 plugins/check_swap.c:321 +#: plugins/check_swap.c:299 plugins/check_swap.c:341 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:359 +#: plugins/check_swap.c:379 #, c-format -msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" msgstr "" -#: plugins/check_swap.c:441 -msgid "Warning threshold must be integer or percentage!" +#: plugins/check_swap.c:475 +#, fuzzy +msgid "Warning threshold percentage must be <= 100!" +msgstr "Warning threshold Integer sein" + +#: plugins/check_swap.c:485 +#, fuzzy +msgid "Warning threshold be positive integer or percentage!" msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" -#: plugins/check_swap.c:459 -msgid "Critical threshold must be integer or percentage!" +#: plugins/check_swap.c:505 +#, fuzzy +msgid "Critical threshold percentage must be <= 100!" +msgstr "Critical threshold muss ein Integer sein" + +#: plugins/check_swap.c:515 +#, fuzzy +msgid "Critical threshold be positive integer or percentage!" msgstr "Critical threshold muss ein Integer oder ein Prozentwert sein!" -#: plugins/check_swap.c:466 +#: plugins/check_swap.c:524 msgid "" "no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " "or integer (0-3)." msgstr "" -#: plugins/check_swap.c:517 +#: plugins/check_swap.c:561 #, fuzzy -msgid "Warning percentage should be more than critical percentage" +msgid "Warning should be more than critical" msgstr "Warning threshold muss ein Integer oder ein Prozentwert sein" -#: plugins/check_swap.c:521 -msgid "Warning free space should be more than critical free space" -msgstr "" - -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:575 msgid "Check swap space on local machine." msgstr "" -#: plugins/check_swap.c:545 +#: plugins/check_swap.c:585 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:547 +#: plugins/check_swap.c:587 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:549 +#: plugins/check_swap.c:589 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:551 +#: plugins/check_swap.c:591 msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:553 +#: plugins/check_swap.c:593 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "" -#: plugins/check_swap.c:555 +#: plugins/check_swap.c:595 msgid "" "Resulting state when there is no swap regardless of thresholds. Default:" msgstr "" -#: plugins/check_swap.c:560 +#: plugins/check_swap.c:600 msgid "" "Both INTEGER and PERCENT thresholds can be specified, they are all checked." msgstr "" -#: plugins/check_swap.c:561 +#: plugins/check_swap.c:601 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" @@ -5378,39 +5493,43 @@ msgstr "" msgid "UPS does not support any available options\n" msgstr "IPv6 Unterstützung nicht vorhanden" -#: plugins/check_ups.c:348 plugins/check_ups.c:411 +#: plugins/check_ups.c:348 plugins/check_ups.c:414 #, fuzzy msgid "Invalid response received from host" msgstr "Ungültige HTTP Antwort von Host empfangen\n" -#: plugins/check_ups.c:420 +#: plugins/check_ups.c:406 +msgid "UPS name to long for buffer" +msgstr "" + +#: plugins/check_ups.c:423 #, fuzzy, c-format msgid "CRITICAL - no such UPS '%s' on that host\n" msgstr "%s [%s nicht gefunden]" -#: plugins/check_ups.c:430 +#: plugins/check_ups.c:433 #, fuzzy msgid "CRITICAL - UPS data is stale" msgstr "CRITICAL - Serverdatum \"%100s\" konnte nicht verarbeitet werden" -#: plugins/check_ups.c:435 +#: plugins/check_ups.c:438 #, fuzzy, c-format msgid "Unknown error: %s\n" msgstr "Papierfehler" -#: plugins/check_ups.c:442 +#: plugins/check_ups.c:445 msgid "Error: unable to parse variable" msgstr "" -#: plugins/check_ups.c:549 +#: plugins/check_ups.c:552 msgid "Unrecognized UPS variable" msgstr "" -#: plugins/check_ups.c:587 +#: plugins/check_ups.c:590 msgid "Error : no UPS indicated" msgstr "" -#: plugins/check_ups.c:607 +#: plugins/check_ups.c:610 #, fuzzy msgid "" "This plugin tests the UPS service on the specified host. Network UPS Tools" @@ -5418,79 +5537,79 @@ msgstr "" "Testet den DNS Dienst auf dem angegebenen Host mit dig\n" "\n" -#: plugins/check_ups.c:608 +#: plugins/check_ups.c:611 msgid "from www.networkupstools.org must be running for this plugin to work." msgstr "" -#: plugins/check_ups.c:620 +#: plugins/check_ups.c:623 msgid "Name of UPS" msgstr "" -#: plugins/check_ups.c:622 +#: plugins/check_ups.c:625 msgid "Output of temperatures in Celsius" msgstr "" -#: plugins/check_ups.c:624 +#: plugins/check_ups.c:627 msgid "Valid values for STRING are" msgstr "" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:638 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:636 +#: plugins/check_ups.c:639 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:640 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:641 msgid "" "state. If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:646 msgid "" "You may also specify a variable to check (such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:647 msgid "" "battery load, etc.) as well as warning and critical thresholds for the value" msgstr "" -#: plugins/check_ups.c:645 +#: plugins/check_ups.c:648 msgid "" "of that variable. If the remote host has multiple UPS that are being " "monitored" msgstr "" -#: plugins/check_ups.c:646 +#: plugins/check_ups.c:649 msgid "you will have to use the --ups option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:648 +#: plugins/check_ups.c:651 msgid "" "This plugin requires that the UPSD daemon distributed with Russell Kroll's" msgstr "" -#: plugins/check_ups.c:649 +#: plugins/check_ups.c:652 msgid "" "Network UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:650 +#: plugins/check_ups.c:653 msgid "package installed on your system, you can download it from" msgstr "" -#: plugins/check_ups.c:651 +#: plugins/check_ups.c:654 msgid "http://www.networkupstools.org" msgstr "" @@ -5900,33 +6019,33 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:437 +#: plugins/utils.c:479 #, fuzzy msgid "failed realloc in strpcpy\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/utils.c:479 +#: plugins/utils.c:521 #, fuzzy msgid "failed malloc in strscat\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/utils.c:499 +#: plugins/utils.c:541 #, fuzzy msgid "failed malloc in xvasprintf\n" msgstr "konnte keinen Speicher für '%s' reservieren\n" -#: plugins/utils.c:693 +#: plugins/utils.c:819 msgid "sysconf error for _SC_OPEN_MAX\n" msgstr "" -#: plugins/utils.h:118 +#: plugins/utils.h:127 #, c-format msgid "" " %s (-h | --help) for detailed help\n" " %s (-V | --version) for version information\n" msgstr "" -#: plugins/utils.h:122 +#: plugins/utils.h:131 msgid "" "\n" "Options:\n" @@ -5936,7 +6055,7 @@ msgid "" " Print version information\n" msgstr "" -#: plugins/utils.h:129 +#: plugins/utils.h:138 #, c-format msgid "" " -H, --hostname=ADDRESS\n" @@ -5945,7 +6064,7 @@ msgid "" " Port number (default: %s)\n" msgstr "" -#: plugins/utils.h:135 +#: plugins/utils.h:144 msgid "" " -4, --use-ipv4\n" " Use IPv4 connection\n" @@ -5953,14 +6072,14 @@ msgid "" " Use IPv6 connection\n" msgstr "" -#: plugins/utils.h:141 +#: plugins/utils.h:150 msgid "" " -v, --verbose\n" " Show details for command-line debugging (output may be truncated by\n" " the monitoring system)\n" msgstr "" -#: plugins/utils.h:146 +#: plugins/utils.h:155 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -5968,7 +6087,7 @@ msgid "" " Response time to result in critical status (seconds)\n" msgstr "" -#: plugins/utils.h:152 +#: plugins/utils.h:161 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -5976,21 +6095,21 @@ msgid "" " Critical range\n" msgstr "" -#: plugins/utils.h:158 +#: plugins/utils.h:167 #, c-format msgid "" " -t, --timeout=INTEGER\n" " Seconds before connection times out (default: %d)\n" msgstr "" -#: plugins/utils.h:162 +#: plugins/utils.h:171 #, c-format msgid "" " -t, --timeout=INTEGER\n" " Seconds before plugin times out (default: %d)\n" msgstr "" -#: plugins/utils.h:167 +#: plugins/utils.h:176 msgid "" " --extra-opts=[section][@file]\n" " Read options from an ini file. See\n" @@ -5998,14 +6117,14 @@ msgid "" " for usage and examples.\n" msgstr "" -#: plugins/utils.h:176 +#: plugins/utils.h:185 msgid "" " See:\n" " https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" " for THRESHOLD format and examples.\n" msgstr "" -#: plugins/utils.h:181 +#: plugins/utils.h:190 msgid "" "\n" "Send email to help@monitoring-plugins.org if you have questions regarding\n" @@ -6014,7 +6133,7 @@ msgid "" "\n" msgstr "" -#: plugins/utils.h:186 +#: plugins/utils.h:195 msgid "" "\n" "The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " @@ -6344,102 +6463,96 @@ msgstr "" msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1554 +#: plugins-root/check_icmp.c:1569 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1556 +#: plugins-root/check_icmp.c:1571 msgid "Use IPv4 (default) or IPv6 to communicate with the targets" msgstr "" -#: plugins-root/check_icmp.c:1558 +#: plugins-root/check_icmp.c:1573 #, fuzzy msgid "warning threshold (currently " msgstr "Warning threshold Integer sein" -#: plugins-root/check_icmp.c:1561 +#: plugins-root/check_icmp.c:1576 #, fuzzy msgid "critical threshold (currently " msgstr "Critical threshold muss ein Integer sein" -#: plugins-root/check_icmp.c:1564 +#: plugins-root/check_icmp.c:1579 #, fuzzy msgid "specify a source IP address or device name" msgstr "Hostname oder Serveradresse muss angegeben werden" -#: plugins-root/check_icmp.c:1566 +#: plugins-root/check_icmp.c:1581 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1569 +#: plugins-root/check_icmp.c:1584 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1572 +#: plugins-root/check_icmp.c:1587 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1575 +#: plugins-root/check_icmp.c:1590 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1578 +#: plugins-root/check_icmp.c:1593 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1581 +#: plugins-root/check_icmp.c:1596 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1584 +#: plugins-root/check_icmp.c:1599 msgid "Number of icmp data bytes to send" msgstr "" -#: plugins-root/check_icmp.c:1585 +#: plugins-root/check_icmp.c:1600 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1587 +#: plugins-root/check_icmp.c:1602 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1591 +#: plugins-root/check_icmp.c:1606 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1593 +#: plugins-root/check_icmp.c:1608 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1594 +#: plugins-root/check_icmp.c:1609 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1595 +#: plugins-root/check_icmp.c:1610 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1596 +#: plugins-root/check_icmp.c:1611 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1602 +#: plugins-root/check_icmp.c:1617 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" -#, fuzzy +#, fuzzy, c-format #~ msgid "%s - Plugin timed out after %d seconds\n" #~ msgstr "CRITICAL - Dokumentendatum ist %d Sekunden in der Zukunft\n" -#~ msgid "Critical threshold must be integer" -#~ msgstr "Critical threshold muss ein Integer sein" - -#~ msgid "Warning threshold must be integer" -#~ msgstr "Warning threshold Integer sein" - #, fuzzy #~ msgid "Critical Process Count must be an integer!" #~ msgstr "Critical threshold muss ein Integer sein" diff --git a/po/fr.gmo b/po/fr.gmo index 52f9695..d9b9e89 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 4422742..4714b3c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2021-04-10 16:17+0200\n" +"POT-Creation-Date: 2022-10-19 14:57+0200\n" "PO-Revision-Date: 2010-04-21 23:38-0400\n" "Last-Translator: Thomas Guyot-Sionnest \n" "Language-Team: Nagios Plugin Development Mailing List argument with optional text" msgstr "du paramètre avec un texte optionnel" -#: plugins/check_fping.c:125 plugins/check_hpjd.c:130 plugins/check_ping.c:438 -#: plugins/check_swap.c:176 plugins/check_users.c:130 plugins/urlize.c:109 +#: plugins/check_fping.c:127 plugins/check_hpjd.c:134 plugins/check_ping.c:444 +#: plugins/check_swap.c:196 plugins/check_users.c:130 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "Impossible d'ouvrir le pipe: %s\n" -#: plugins/check_fping.c:131 plugins/check_hpjd.c:136 plugins/check_load.c:157 -#: plugins/check_swap.c:182 plugins/check_users.c:136 plugins/urlize.c:115 +#: plugins/check_fping.c:133 plugins/check_hpjd.c:140 plugins/check_load.c:159 +#: plugins/check_swap.c:202 plugins/check_users.c:136 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "Impossible d'ouvrir la sortie d'erreur standard pour %s\n" -#: plugins/check_fping.c:157 +#: plugins/check_fping.c:161 #, fuzzy msgid "FPING UNKNOWN - IP address not found\n" msgstr "PING INCONNU - Hôte non trouvé (%s)\n" -#: plugins/check_fping.c:160 +#: plugins/check_fping.c:164 msgid "FPING UNKNOWN - invalid commandline argument\n" msgstr "" -#: plugins/check_fping.c:163 +#: plugins/check_fping.c:167 #, fuzzy msgid "FPING UNKNOWN - failed system call\n" msgstr "PING INCONNU - Hôte non trouvé (%s)\n" -#: plugins/check_fping.c:187 +#: plugins/check_fping.c:194 +#, fuzzy, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" + +#: plugins/check_fping.c:202 #, c-format msgid "FPING UNKNOWN - %s not found\n" msgstr "PING INCONNU - Hôte non trouvé (%s)\n" -#: plugins/check_fping.c:191 +#: plugins/check_fping.c:206 #, c-format msgid "FPING CRITICAL - %s is unreachable\n" msgstr "PING CRITIQUE - Hôte inaccessible (%s)\n" -#: plugins/check_fping.c:196 +#: plugins/check_fping.c:211 #, fuzzy, c-format msgid "FPING UNKNOWN - %s parameter error\n" msgstr "PING INCONNU - Hôte non trouvé (%s)\n" -#: plugins/check_fping.c:200 plugins/check_fping.c:240 +#: plugins/check_fping.c:215 plugins/check_fping.c:255 #, c-format msgid "FPING CRITICAL - %s is down\n" msgstr "FPING CRITIQUE - %s est en panne\n" -#: plugins/check_fping.c:227 +#: plugins/check_fping.c:242 #, c-format msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" msgstr "FPING %s - %s (perte=%.0f%%, rta=%f ms)|%s %s\n" -#: plugins/check_fping.c:253 +#: plugins/check_fping.c:268 #, c-format msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "FPING %s - %s (perte=%.0f%% )|%s\n" -#: plugins/check_fping.c:326 plugins/check_fping.c:332 -#: plugins/check_hpjd.c:341 plugins/check_hpjd.c:372 plugins/check_mysql.c:386 -#: plugins/check_mysql.c:473 plugins/check_ntp.c:719 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 -#: plugins/check_pgsql.c:336 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:275 plugins/check_real.c:315 -#: plugins/check_real.c:377 plugins/check_smtp.c:504 plugins/check_smtp.c:646 -#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 -#: plugins/check_ups.c:504 plugins/check_ups.c:573 +#: plugins/check_fping.c:345 plugins/check_fping.c:351 plugins/check_hpjd.c:345 +#: plugins/check_hpjd.c:376 plugins/check_mysql.c:386 plugins/check_mysql.c:473 +#: plugins/check_ntp.c:719 plugins/check_ntp_peer.c:497 +#: plugins/check_ntp_time.c:498 plugins/check_pgsql.c:339 +#: plugins/check_ping.c:301 plugins/check_ping.c:424 plugins/check_radius.c:275 +#: plugins/check_real.c:315 plugins/check_real.c:377 plugins/check_smtp.c:509 +#: plugins/check_smtp.c:654 plugins/check_ssh.c:162 plugins/check_time.c:240 +#: plugins/check_time.c:315 plugins/check_ups.c:507 plugins/check_ups.c:576 msgid "Invalid hostname/address" msgstr "Adresse/Nom d'hôte invalide" -#: plugins/check_fping.c:345 plugins/check_ldap.c:400 plugins/check_ping.c:246 -#: plugins-root/check_icmp.c:480 +#: plugins/check_fping.c:364 plugins/check_ldap.c:400 plugins/check_ping.c:252 +#: plugins-root/check_icmp.c:469 msgid "IPv6 support not available\n" msgstr "Support IPv6 non disponible\n" -#: plugins/check_fping.c:378 +#: plugins/check_fping.c:397 msgid "Packet size must be a positive integer" msgstr "La taille du paquet doit être un entier positif" -#: plugins/check_fping.c:384 +#: plugins/check_fping.c:403 msgid "Packet count must be a positive integer" msgstr "Le nombre de paquets doit être un entier positif" -#: plugins/check_fping.c:390 +#: plugins/check_fping.c:409 msgid "Target timeout must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_fping.c:396 +#: plugins/check_fping.c:415 msgid "Interval must be a positive integer" msgstr "Le délai d'attente doit être un entier positif" -#: plugins/check_fping.c:402 plugins/check_ntp.c:743 +#: plugins/check_fping.c:421 plugins/check_ntp.c:743 #: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:528 #: plugins/check_radius.c:325 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "Le nom de l'hôte n'a pas été spécifié" -#: plugins/check_fping.c:422 +#: plugins/check_fping.c:441 #, c-format msgid "%s: Only one threshold may be packet loss (%s)\n" msgstr "" "%s: Seulement un seuil peut être utilisé pour les pertes de paquets (%s)\n" -#: plugins/check_fping.c:426 +#: plugins/check_fping.c:445 #, c-format msgid "%s: Only one threshold must be packet loss (%s)\n" msgstr "" "%s: Seulement un seuil doit être utilisé pour les pertes de paquets (%s)\n" -#: plugins/check_fping.c:458 +#: plugins/check_fping.c:475 msgid "" "This plugin will use the fping command to ping the specified host for a fast " "check" msgstr "" "Ce plugin va utiliser la commande fping pour pinger l'hôte de manière rapide." -#: plugins/check_fping.c:460 +#: plugins/check_fping.c:477 msgid "Note that it is necessary to set the suid flag on fping." msgstr "" "Veuillez noter qu'il est nécessaire de mettre le bit suid sur le programme " "fping." -#: plugins/check_fping.c:472 +#: plugins/check_fping.c:489 msgid "" "name or IP Address of host to ping (IP Address bypasses name lookup, " "reducing system load)" @@ -1022,39 +1050,43 @@ msgstr "" "nom ou adresse IP des hôtes à pinger (l'indication d'un adresse IP évite une " "recherche sur le nom, ce qui réduit la charge système)" -#: plugins/check_fping.c:474 plugins/check_ping.c:582 +#: plugins/check_fping.c:491 plugins/check_ping.c:589 msgid "warning threshold pair" msgstr "Valeurs pour le seuil d'avertissement" -#: plugins/check_fping.c:476 plugins/check_ping.c:584 +#: plugins/check_fping.c:493 plugins/check_ping.c:591 msgid "critical threshold pair" msgstr "Valeurs pour le seuil critique" -#: plugins/check_fping.c:478 +#: plugins/check_fping.c:495 +msgid "Return OK after first successfull reply" +msgstr "" + +#: plugins/check_fping.c:497 msgid "size of ICMP packet" msgstr "taille du paquet ICMP" -#: plugins/check_fping.c:480 +#: plugins/check_fping.c:499 msgid "number of ICMP packets to send" msgstr "nombre de paquets ICMP à envoyer" -#: plugins/check_fping.c:482 +#: plugins/check_fping.c:501 msgid "Target timeout (ms)" msgstr "" -#: plugins/check_fping.c:484 +#: plugins/check_fping.c:503 msgid "Interval (ms) between sending packets" msgstr "" -#: plugins/check_fping.c:486 +#: plugins/check_fping.c:505 msgid "name or IP Address of sourceip" msgstr "" -#: plugins/check_fping.c:488 +#: plugins/check_fping.c:507 msgid "source interface name" msgstr "" -#: plugins/check_fping.c:491 +#: plugins/check_fping.c:510 #, c-format msgid "" "THRESHOLD is ,%% where is the round trip average travel time " @@ -1063,18 +1095,18 @@ msgstr "" "Le seuil est ,%% ou est le temps moyen pour l'aller retour " "(ms)" -#: plugins/check_fping.c:492 +#: plugins/check_fping.c:511 msgid "" "which triggers a WARNING or CRITICAL state, and is the percentage of" msgstr "" "qui déclenche résultat AVERTISSEMENT ou CRITIQUE, et est le pourcentage " "de" -#: plugins/check_fping.c:493 +#: plugins/check_fping.c:512 msgid "packet loss to trigger an alarm state." msgstr "paquets perdu pour déclencher une alarme." -#: plugins/check_fping.c:496 +#: plugins/check_fping.c:515 msgid "IPv4 is used by default. Specify -6 to use IPv6." msgstr "" @@ -1134,673 +1166,695 @@ msgstr "" "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" #: plugins/check_game.c:321 -msgid "" -"http://www.activesw.com/people/steve/qstat.html before you can use this " -"plugin." +#, fuzzy +msgid "https://github.com/multiplay/qstat before you can use this plugin." msgstr "" "http://www.activesw.com/people/steve/qstat.html avant de pouvoir utiliser ce " "plugin." -#: plugins/check_hpjd.c:241 +#: plugins/check_hpjd.c:245 msgid "Paper Jam" msgstr "Bourrage Papier" -#: plugins/check_hpjd.c:246 +#: plugins/check_hpjd.c:250 msgid "Out of Paper" msgstr "Plus de Papier" -#: plugins/check_hpjd.c:251 +#: plugins/check_hpjd.c:255 msgid "Printer Offline" msgstr "Imprimante hors ligne" -#: plugins/check_hpjd.c:256 +#: plugins/check_hpjd.c:260 msgid "Peripheral Error" msgstr "Erreur du périphérique" -#: plugins/check_hpjd.c:260 +#: plugins/check_hpjd.c:264 msgid "Intervention Required" msgstr "Intervention Requise" -#: plugins/check_hpjd.c:264 +#: plugins/check_hpjd.c:268 msgid "Toner Low" msgstr "Toner Faible" -#: plugins/check_hpjd.c:268 +#: plugins/check_hpjd.c:272 msgid "Insufficient Memory" msgstr "Mémoire Insuffisante" -#: plugins/check_hpjd.c:272 +#: plugins/check_hpjd.c:276 msgid "A Door is Open" msgstr "Une porte est ouverte" -#: plugins/check_hpjd.c:276 +#: plugins/check_hpjd.c:280 msgid "Output Tray is Full" msgstr "Le bac de sortie est plein" -#: plugins/check_hpjd.c:280 +#: plugins/check_hpjd.c:284 msgid "Data too Slow for Engine" msgstr "Le données arrivent trop lentement pour l'imprimante" -#: plugins/check_hpjd.c:284 +#: plugins/check_hpjd.c:288 msgid "Unknown Paper Error" msgstr "Erreur de papier inconnue" -#: plugins/check_hpjd.c:289 +#: plugins/check_hpjd.c:293 #, c-format msgid "Printer ok - (%s)\n" msgstr "Imprimante ok - (%s)\n" -#: plugins/check_hpjd.c:349 +#: plugins/check_hpjd.c:353 #, fuzzy msgid "Port must be a positive short integer" msgstr "Le numéro du port doit être un entier positif" -#: plugins/check_hpjd.c:409 +#: plugins/check_hpjd.c:410 msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." msgstr "Ce plugin teste l'état d'une imprimante HP avec une carte JetDirect." -#: plugins/check_hpjd.c:410 +#: plugins/check_hpjd.c:411 msgid "Net-snmp must be installed on the computer running the plugin." msgstr "Net-snmp doit être installé sur l'ordinateur qui exécute le plugin." -#: plugins/check_hpjd.c:420 +#: plugins/check_hpjd.c:421 msgid "The SNMP community name " msgstr "Le nom de la communauté SNMP " -#: plugins/check_hpjd.c:421 plugins/check_hpjd.c:425 +#: plugins/check_hpjd.c:422 plugins/check_hpjd.c:426 #, c-format msgid "(default=%s)" msgstr "(défaut=%s)" -#: plugins/check_hpjd.c:424 +#: plugins/check_hpjd.c:425 #, fuzzy msgid "Specify the port to check " msgstr "Nom de l'hôte à vérifier" -#: plugins/check_hpjd.c:428 +#: plugins/check_hpjd.c:429 #, fuzzy msgid "Disable paper check " msgstr "Variable a vérifier" -#: plugins/check_http.c:193 +#: plugins/check_http.c:195 msgid "file does not exist or is not readable" msgstr "" -#: plugins/check_http.c:315 plugins/check_http.c:320 plugins/check_http.c:326 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:590 plugins/check_tcp.c:595 +#: plugins/check_http.c:321 plugins/check_http.c:326 plugins/check_http.c:332 +#: plugins/check_smtp.c:605 plugins/check_tcp.c:590 plugins/check_tcp.c:595 #: plugins/check_tcp.c:601 msgid "Invalid certificate expiration period" msgstr "Période d'expiration du certificat invalide" -#: plugins/check_http.c:364 +#: plugins/check_http.c:375 msgid "" "Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " "'+' suffix)" msgstr "" -#: plugins/check_http.c:370 plugins/check_tcp.c:614 plugins/check_tcp.c:623 +#: plugins/check_http.c:381 plugins/check_tcp.c:614 plugins/check_tcp.c:623 msgid "Invalid option - SSL is not available" msgstr "Option invalide - SSL n'est pas disponible" -#: plugins/check_http.c:391 +#: plugins/check_http.c:389 +msgid "Invalid max_redirs count" +msgstr "" + +#: plugins/check_http.c:409 msgid "Invalid onredirect option" msgstr "" -#: plugins/check_http.c:393 +#: plugins/check_http.c:411 #, c-format msgid "option f:%d \n" msgstr "option f:%d \n" -#: plugins/check_http.c:428 +#: plugins/check_http.c:446 msgid "Invalid port number" msgstr "Numéro de port invalide" -#: plugins/check_http.c:486 +#: plugins/check_http.c:504 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "Impossible de compiler l'expression rationnelle: %s" -#: plugins/check_http.c:500 plugins/check_ntp.c:732 +#: plugins/check_http.c:518 plugins/check_ntp.c:732 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:517 -#: plugins/check_smtp.c:626 plugins/check_ssh.c:151 plugins/check_tcp.c:491 +#: plugins/check_smtp.c:634 plugins/check_ssh.c:151 plugins/check_tcp.c:491 msgid "IPv6 support not available" msgstr "Support IPv6 non disponible" -#: plugins/check_http.c:568 plugins/check_ping.c:422 +#: plugins/check_http.c:586 plugins/check_ping.c:428 msgid "You must specify a server address or host name" msgstr "Vous devez spécifier une adresse ou un nom d'hôte" -#: plugins/check_http.c:585 +#: plugins/check_http.c:603 msgid "" "If you use a client certificate you must also specify a private key file" msgstr "" -#: plugins/check_http.c:712 plugins/check_http.c:880 +#: plugins/check_http.c:730 plugins/check_http.c:898 msgid "HTTP UNKNOWN - Memory allocation error\n" msgstr "HTTP INCONNU - Impossible d'allouer la mémoire\n" -#: plugins/check_http.c:784 +#: plugins/check_http.c:802 #, c-format msgid "%sServer date unknown, " msgstr "%sDate du serveur inconnue, " -#: plugins/check_http.c:787 +#: plugins/check_http.c:805 #, c-format msgid "%sDocument modification date unknown, " msgstr "%sDate de modification du document inconnue, " -#: plugins/check_http.c:794 +#: plugins/check_http.c:812 #, c-format msgid "%sServer date \"%100s\" unparsable, " msgstr "%sDate du serveur \"%100s\" illisible, " -#: plugins/check_http.c:797 +#: plugins/check_http.c:815 #, c-format msgid "%sDocument date \"%100s\" unparsable, " msgstr "%sDate du document \"%100s\" illisible, " -#: plugins/check_http.c:800 +#: plugins/check_http.c:818 #, c-format msgid "%sDocument is %d seconds in the future, " msgstr "%sLa date du document est %d secondes dans le futur, " -#: plugins/check_http.c:805 +#: plugins/check_http.c:823 #, c-format msgid "%sLast modified %.1f days ago, " msgstr "%sDernière modification %.1f jours auparavant, " -#: plugins/check_http.c:808 +#: plugins/check_http.c:826 #, c-format msgid "%sLast modified %d:%02d:%02d ago, " msgstr "%sDernière modification %d:%02d:%02d auparavant, " -#: plugins/check_http.c:922 +#: plugins/check_http.c:940 msgid "HTTP CRITICAL - Unable to open TCP socket\n" msgstr "HTTP CRITIQUE - Impossible d'ouvrir un socket TCP\n" -#: plugins/check_http.c:1106 +#: plugins/check_http.c:1126 msgid "HTTP CRITICAL - Error on receive\n" msgstr "HTTP CRITIQUE - Erreur dans la réception\n" -#: plugins/check_http.c:1116 +#: plugins/check_http.c:1136 msgid "HTTP CRITICAL - No data received from host\n" msgstr "HTTP CRITIQUE - Pas de données reçues de l'hôte\n" -#: plugins/check_http.c:1167 +#: plugins/check_http.c:1187 #, c-format msgid "Invalid HTTP response received from host: %s\n" msgstr "Réponse HTTP reçue de l'hôte invalide: %s\n" -#: plugins/check_http.c:1171 +#: plugins/check_http.c:1191 #, c-format msgid "Invalid HTTP response received from host on port %d: %s\n" msgstr "Réponse HTTP reçue de l'hôte sur le port %d invalide: %s\n" -#: plugins/check_http.c:1174 plugins/check_http.c:1326 +#: plugins/check_http.c:1194 plugins/check_http.c:1346 #, c-format msgid "" "%s\n" "%s" msgstr "" -#: plugins/check_http.c:1182 +#: plugins/check_http.c:1202 #, c-format msgid "Status line output matched \"%s\" - " msgstr "La ligne d'état correspond à \"%s\" - " -#: plugins/check_http.c:1193 +#: plugins/check_http.c:1213 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "HTTP CRITIQUE: Ligne d'état non valide (%s)\n" -#: plugins/check_http.c:1200 +#: plugins/check_http.c:1220 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "HTTP CRITIQUE: Etat Invalide (%s)\n" -#: plugins/check_http.c:1204 plugins/check_http.c:1209 -#: plugins/check_http.c:1219 plugins/check_http.c:1223 +#: plugins/check_http.c:1224 plugins/check_http.c:1229 +#: plugins/check_http.c:1239 plugins/check_http.c:1243 #, c-format msgid "%s - " msgstr "" -#: plugins/check_http.c:1242 +#: plugins/check_http.c:1262 #, fuzzy, c-format msgid "%sheader '%s' not found on '%s://%s:%d%s', " msgstr "%schaîne non trouvée, " -#: plugins/check_http.c:1254 +#: plugins/check_http.c:1274 #, fuzzy, c-format msgid "%sstring '%s' not found on '%s://%s:%d%s', " msgstr "%schaîne non trouvée, " -#: plugins/check_http.c:1267 +#: plugins/check_http.c:1287 #, c-format msgid "%spattern not found, " msgstr "%sexpression non trouvée, " -#: plugins/check_http.c:1269 +#: plugins/check_http.c:1289 #, c-format msgid "%spattern found, " msgstr "%sexpression trouvée, " -#: plugins/check_http.c:1275 +#: plugins/check_http.c:1295 #, c-format msgid "%sExecute Error: %s, " msgstr "%sErreur d'exécution: %s, " -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1311 #, c-format msgid "%spage size %d too large, " msgstr "%sla taille de la page est trop grande (%d), " -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1314 #, c-format msgid "%spage size %d too small, " msgstr "%sla taille de la page est trop petite (%d), " -#: plugins/check_http.c:1307 +#: plugins/check_http.c:1327 #, fuzzy, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" -#: plugins/check_http.c:1319 +#: plugins/check_http.c:1339 #, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s" msgstr "%s - %d octets en %.3f secondes de temps de réponse %s|%s %s" -#: plugins/check_http.c:1360 +#: plugins/check_http.c:1382 msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "HTTP INCONNU - Impossible d'allouer une adresse\n" -#: plugins/check_http.c:1365 plugins/check_http.c:1396 +#: plugins/check_http.c:1387 plugins/check_http.c:1418 msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "HTTP INCONNU - Impossible d'allouer l'URL\n" -#: plugins/check_http.c:1374 +#: plugins/check_http.c:1396 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" "HTTP INCONNU - Impossible de trouver l'endroit de la redirection - %s%s\n" -#: plugins/check_http.c:1389 +#: plugins/check_http.c:1411 #, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "HTTP INCONNU - endroit de redirection vide%s\n" -#: plugins/check_http.c:1439 +#: plugins/check_http.c:1473 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" "HTTP INCONNU - Impossible de définir l'endroit de la redirection - %s%s\n" -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1483 #, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" "HTTP AVERTISSEMENT - le niveau maximum de redirection %d à été dépassé - " "%s://%s:%d%s%s\n" -#: plugins/check_http.c:1457 -#, c-format -msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +#: plugins/check_http.c:1491 +#, fuzzy, c-format +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "" "HTTP AVERTISSEMENT - la redirection crée une boucle infinie - %s://%s:%d%s" "%s\n" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1512 #, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "HTTP INCONNU - Redirection à un port supérieur à %d - %s://%s:%d%s%s\n" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1520 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "Redirection vers %s://%s:%d%s\n" -#: plugins/check_http.c:1561 +#: plugins/check_http.c:1595 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" "Ce plugin teste le service HTTP sur l'hôte spécifié. Il peut tester les" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1596 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" "serveurs normaux (http) et sécurisés (https), suivre les redirections, " "rechercher des" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1597 msgid "strings and regular expressions, check connection times, and report on" msgstr "" "chaînes de caractères et expressions rationnelles, vérifier le temps de " "réponse" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1598 msgid "certificate expiration times." msgstr "et rapporter la date d'expiration du certificat." -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1605 #, c-format msgid "In the first form, make an HTTP request." msgstr "" -#: plugins/check_http.c:1572 +#: plugins/check_http.c:1606 #, c-format msgid "" "In the second form, connect to the server and check the TLS certificate." msgstr "" -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1608 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "NOTE: les paramètres -H et -I peuvent être spécifiés" -#: plugins/check_http.c:1582 +#: plugins/check_http.c:1616 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1583 +#: plugins/check_http.c:1617 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1585 +#: plugins/check_http.c:1619 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1587 +#: plugins/check_http.c:1621 msgid "Port number (default: " msgstr "Numéro du port (défaut: " -#: plugins/check_http.c:1594 +#: plugins/check_http.c:1628 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1595 +#: plugins/check_http.c:1629 msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," msgstr "" -#: plugins/check_http.c:1596 +#: plugins/check_http.c:1630 msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." msgstr "" -#: plugins/check_http.c:1598 +#: plugins/check_http.c:1632 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1600 +#: plugins/check_http.c:1634 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" "Nombre de jours minimum pour que le certificat soit valide. Port par défaut " "443" -#: plugins/check_http.c:1601 -msgid "(when this option is used the URL is not checked.)" +#: plugins/check_http.c:1635 +msgid "" +"(when this option is used the URL is not checked by default. You can use" msgstr "" -#: plugins/check_http.c:1603 +#: plugins/check_http.c:1636 +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +#: plugins/check_http.c:1638 +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +#: plugins/check_http.c:1639 +msgid "Does nothing unless -C is used." +msgstr "" + +#: plugins/check_http.c:1641 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1604 +#: plugins/check_http.c:1642 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1606 +#: plugins/check_http.c:1644 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1607 +#: plugins/check_http.c:1645 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1611 +#: plugins/check_http.c:1649 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" "Liste the chaines de charactères séparées par des virgules, au moins une " "d'elles" -#: plugins/check_http.c:1612 +#: plugins/check_http.c:1650 msgid "the first (status) line of the server response (default: " msgstr "est attendue dans la première ligne de réponse du serveur (défaut: " -#: plugins/check_http.c:1614 +#: plugins/check_http.c:1652 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" "Si spécifié, surpasse toute autre logique de status (ex: 3xx, 4xx, 5xx)" -#: plugins/check_http.c:1616 +#: plugins/check_http.c:1654 #, fuzzy msgid "String to expect in the response headers" msgstr "Chaîne de caractères à attendre en réponse" -#: plugins/check_http.c:1618 +#: plugins/check_http.c:1656 msgid "String to expect in the content" msgstr "Chaîne de caractère attendue dans le contenu" -#: plugins/check_http.c:1620 +#: plugins/check_http.c:1658 msgid "URL to GET or POST (default: /)" msgstr "URL pour le GET ou le POST (défaut: /)" -#: plugins/check_http.c:1622 +#: plugins/check_http.c:1660 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1624 +#: plugins/check_http.c:1662 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1626 +#: plugins/check_http.c:1664 msgid "Don't wait for document body: stop reading after headers." msgstr "" "Ne pas attendre pour le corps du document: arrêter de lire après les entêtes" -#: plugins/check_http.c:1627 +#: plugins/check_http.c:1665 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "(Veuillez noter qu'un HTTP GET ou POST est effectué, pas un HEAD.)" -#: plugins/check_http.c:1629 +#: plugins/check_http.c:1667 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1630 +#: plugins/check_http.c:1668 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1632 +#: plugins/check_http.c:1670 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1635 +#: plugins/check_http.c:1673 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1637 +#: plugins/check_http.c:1675 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1639 +#: plugins/check_http.c:1677 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1641 +#: plugins/check_http.c:1679 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1644 +#: plugins/check_http.c:1682 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1646 +#: plugins/check_http.c:1684 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1648 +#: plugins/check_http.c:1686 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1650 +#: plugins/check_http.c:1688 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1652 +#: plugins/check_http.c:1690 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1654 +#: plugins/check_http.c:1692 msgid "Print body content below status line" msgstr "" -#: plugins/check_http.c:1656 +#: plugins/check_http.c:1694 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1658 +#: plugins/check_http.c:1696 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1659 +#: plugins/check_http.c:1697 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1661 +#: plugins/check_http.c:1699 +#, fuzzy +msgid "Maximal number of redirects (default: " +msgstr "PROCS - nombre de processus (défaut)" + +#: plugins/check_http.c:1702 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1671 +#: plugins/check_http.c:1711 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." -#: plugins/check_http.c:1672 +#: plugins/check_http.c:1712 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1673 +#: plugins/check_http.c:1713 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "response" msgstr "" -#: plugins/check_http.c:1674 +#: plugins/check_http.c:1714 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1675 +#: plugins/check_http.c:1715 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1676 +#: plugins/check_http.c:1716 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1680 +#: plugins/check_http.c:1720 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1681 +#: plugins/check_http.c:1721 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1682 +#: plugins/check_http.c:1722 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1684 +#: plugins/check_http.c:1724 #, fuzzy msgid "Please note that this plugin does not check if the presented server" msgstr "Ce plugin vérifie le service ntp sur l'hôte" -#: plugins/check_http.c:1685 +#: plugins/check_http.c:1725 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1686 +#: plugins/check_http.c:1726 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1690 +#: plugins/check_http.c:1730 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1691 plugins/check_http.c:1710 +#: plugins/check_http.c:1731 plugins/check_http.c:1750 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1692 plugins/check_http.c:1711 +#: plugins/check_http.c:1732 plugins/check_http.c:1751 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1693 +#: plugins/check_http.c:1733 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1696 +#: plugins/check_http.c:1736 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1697 plugins/check_http.c:1703 +#: plugins/check_http.c:1737 plugins/check_http.c:1743 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1698 +#: plugins/check_http.c:1738 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1699 +#: plugins/check_http.c:1739 msgid "the certificate is expired." msgstr "le certificat est expiré." -#: plugins/check_http.c:1702 +#: plugins/check_http.c:1742 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1704 +#: plugins/check_http.c:1744 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1705 +#: plugins/check_http.c:1745 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" msgstr "" -#: plugins/check_http.c:1708 +#: plugins/check_http.c:1748 msgid "" "check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " "CONNECT -H www.verisign.com " msgstr "" -#: plugins/check_http.c:1709 +#: plugins/check_http.c:1749 msgid "" -"all these options are needed: -I -p -u -S" -"(sl) -j CONNECT -H " +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " msgstr "" -#: plugins/check_http.c:1712 +#: plugins/check_http.c:1752 msgid "" "a STATE_CRITICAL will be returned. By adding a colon to the method you can " "set the method used" msgstr "" -#: plugins/check_http.c:1713 +#: plugins/check_http.c:1753 msgid "inside the proxied connection: -j CONNECT:POST" msgstr "" @@ -1868,130 +1922,132 @@ msgstr "Veuillez spécifier le nom de l'hôte\n" msgid "Please specify the LDAP base\n" msgstr "Veuillez spécifier la base LDAP\n" -#: plugins/check_ldap.c:462 +#: plugins/check_ldap.c:465 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:464 +#: plugins/check_ldap.c:467 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:466 +#: plugins/check_ldap.c:469 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:468 -msgid "ldap password (if required)" +#: plugins/check_ldap.c:471 +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" msgstr "" -#: plugins/check_ldap.c:470 +#: plugins/check_ldap.c:473 msgid "use starttls mechanism introduced in protocol version 3" msgstr "utiliser le fonctionnement starttls du protocole version 3" -#: plugins/check_ldap.c:472 +#: plugins/check_ldap.c:475 msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" msgstr "" -#: plugins/check_ldap.c:476 +#: plugins/check_ldap.c:479 msgid "use ldap protocol version 2" msgstr "utiliser le protocole ldap version 2" -#: plugins/check_ldap.c:478 +#: plugins/check_ldap.c:481 msgid "use ldap protocol version 3" msgstr "utiliser le protocole ldap version 3" -#: plugins/check_ldap.c:479 +#: plugins/check_ldap.c:482 msgid "default protocol version:" msgstr "version du protocole par défaut:" -#: plugins/check_ldap.c:485 +#: plugins/check_ldap.c:488 #, fuzzy msgid "Number of found entries to result in warning status" msgstr "Décalage résultant en un avertissement (secondes)" -#: plugins/check_ldap.c:487 +#: plugins/check_ldap.c:490 #, fuzzy msgid "Number of found entries to result in critical status" msgstr "Décalage résultant en un état critique (secondes)" -#: plugins/check_ldap.c:495 +#: plugins/check_ldap.c:498 msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" msgstr "" -#: plugins/check_ldap.c:496 +#: plugins/check_ldap.c:499 #, c-format msgid "" " implied (using default port %i) unless --port=636 is specified. In that " "case\n" msgstr "" -#: plugins/check_ldap.c:497 +#: plugins/check_ldap.c:500 msgid "'SSL on connect' will be used no matter how the plugin was called." msgstr "" -#: plugins/check_ldap.c:498 +#: plugins/check_ldap.c:501 msgid "" "This detection is deprecated, please use 'check_ldap' with the '--starttls' " "or '--ssl' flags" msgstr "" -#: plugins/check_ldap.c:499 +#: plugins/check_ldap.c:502 msgid "to define the behaviour explicitly instead." msgstr "" -#: plugins/check_ldap.c:500 +#: plugins/check_ldap.c:503 msgid "The parameters --warn-entries and --crit-entries are optional." msgstr "" -#: plugins/check_load.c:91 +#: plugins/check_load.c:93 msgid "Warning threshold must be float or float triplet!\n" msgstr "Le seuil d'alerte doit être un nombre à virgule flottante!\n" -#: plugins/check_load.c:136 plugins/check_load.c:152 +#: plugins/check_load.c:138 plugins/check_load.c:154 #, c-format msgid "Error opening %s\n" msgstr "Erreur à l'ouverture de %s\n" -#: plugins/check_load.c:167 +#: plugins/check_load.c:169 #, fuzzy, c-format -msgid "could not parse load from uptime %s: %s\n" +msgid "could not parse load from uptime %s: %d\n" msgstr "Lecture des arguments impossible\n" -#: plugins/check_load.c:173 +#: plugins/check_load.c:175 #, c-format msgid "Error code %d returned in %s\n" msgstr "Le code erreur %d à été retourné par %s\n" -#: plugins/check_load.c:188 +#: plugins/check_load.c:183 #, c-format msgid "Error in getloadavg()\n" msgstr "Erreur dans la fonction getloadavg()\n" -#: plugins/check_load.c:191 plugins/check_load.c:193 +#: plugins/check_load.c:186 plugins/check_load.c:188 #, c-format msgid "Error processing %s\n" msgstr "Erreur lors de l'utilisation de %s\n" -#: plugins/check_load.c:202 +#: plugins/check_load.c:197 plugins/check_load.c:212 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "Charge moyenne: %.2f, %.2f, %.2f" -#: plugins/check_load.c:302 +#: plugins/check_load.c:327 #, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "" "Le seuil critique pour la charge système après %d minutes n'est pas " "spécifié\n" -#: plugins/check_load.c:304 +#: plugins/check_load.c:329 #, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "" "Le seuil d'avertissement pour la charge système après %d minutes n'est pas " "spécifié\n" -#: plugins/check_load.c:306 +#: plugins/check_load.c:331 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " @@ -2000,42 +2056,42 @@ msgstr "" "Arguments Incorrects: %d-minute \"alerte charge système\" est plus grand que " "\"alerte critique charge système\"\n" -#: plugins/check_load.c:322 +#: plugins/check_load.c:346 #, c-format msgid "This plugin tests the current system load average." msgstr "Ce plugin teste la charge système actuelle." -#: plugins/check_load.c:332 +#: plugins/check_load.c:356 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" "Sortir avec un résultat AVERTISSEMENT si la charge moyenne dépasse WLOAD" -#: plugins/check_load.c:334 +#: plugins/check_load.c:358 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "Sortir avec un résultat CRITIQUE si la charge moyenne excède CLOAD" -#: plugins/check_load.c:335 +#: plugins/check_load.c:359 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" -#: plugins/check_load.c:337 +#: plugins/check_load.c:361 msgid "Divide the load averages by the number of CPUs (when possible)" msgstr "" -#: plugins/check_load.c:339 +#: plugins/check_load.c:363 msgid "Number of processes to show when printing the top consuming processes." msgstr "" -#: plugins/check_load.c:340 +#: plugins/check_load.c:364 msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" msgstr "" -#: plugins/check_load.c:377 +#: plugins/check_load.c:401 #, c-format msgid "'%s' exited with non-zero status.\n" msgstr "" -#: plugins/check_load.c:381 +#: plugins/check_load.c:405 #, c-format msgid "some error occurred getting procs list.\n" msgstr "" @@ -3669,425 +3725,438 @@ msgid "" "higher than the warning threshold value, EXCEPT with the uptime variable" msgstr "plus grand que le seuil d'alerte SAUF pour l'option uptime" -#: plugins/check_pgsql.c:223 +#: plugins/check_pgsql.c:225 #, c-format msgid "CRITICAL - no connection to '%s' (%s).\n" msgstr "CRITIQUE - pas de connexion à '%s' (%s).\n" -#: plugins/check_pgsql.c:251 +#: plugins/check_pgsql.c:253 #, fuzzy, c-format msgid " %s - database %s (%f sec.)|%s\n" msgstr " %s - base de données %s (%d sec.)|%s\n" -#: plugins/check_pgsql.c:318 plugins/check_time.c:277 plugins/check_time.c:289 +#: plugins/check_pgsql.c:321 plugins/check_time.c:277 plugins/check_time.c:289 #: plugins/check_users.c:228 msgid "Critical threshold must be a positive integer" msgstr "Le seuil critique doit être un entier positif" -#: plugins/check_pgsql.c:324 plugins/check_time.c:258 plugins/check_time.c:282 +#: plugins/check_pgsql.c:327 plugins/check_time.c:258 plugins/check_time.c:282 #: plugins/check_users.c:226 msgid "Warning threshold must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_pgsql.c:348 +#: plugins/check_pgsql.c:351 msgid "Database name is not valid" msgstr "Le nom de la base de données est invalide" -#: plugins/check_pgsql.c:354 +#: plugins/check_pgsql.c:357 msgid "User name is not valid" msgstr "Le nom de l'utilisateur est invalide" -#: plugins/check_pgsql.c:505 +#: plugins/check_pgsql.c:511 #, c-format msgid "Test whether a PostgreSQL Database is accepting connections." msgstr "Teste si une base de données Postgresql accepte les connections." -#: plugins/check_pgsql.c:517 +#: plugins/check_pgsql.c:523 msgid "Database to check " msgstr "" -#: plugins/check_pgsql.c:518 +#: plugins/check_pgsql.c:524 #, fuzzy, c-format msgid "(default: %s)\n" msgstr "(Défaut: %d)\n" -#: plugins/check_pgsql.c:520 +#: plugins/check_pgsql.c:526 msgid "Login name of user" msgstr "Le nom d'un utilisateur" -#: plugins/check_pgsql.c:522 +#: plugins/check_pgsql.c:528 msgid "Password (BIG SECURITY ISSUE)" msgstr "" -#: plugins/check_pgsql.c:524 +#: plugins/check_pgsql.c:530 msgid "Connection parameters (keyword = value), see below" msgstr "" -#: plugins/check_pgsql.c:531 +#: plugins/check_pgsql.c:537 msgid "SQL query to run. Only first column in first row will be read" msgstr "" -#: plugins/check_pgsql.c:533 +#: plugins/check_pgsql.c:539 +msgid "A name for the query, this string is used instead of the query" +msgstr "" + +#: plugins/check_pgsql.c:540 +msgid "in the long output of the plugin" +msgstr "" + +#: plugins/check_pgsql.c:542 #, fuzzy msgid "SQL query value to result in warning status (double)" msgstr "Décalage résultant en un avertissement (secondes)" -#: plugins/check_pgsql.c:535 +#: plugins/check_pgsql.c:544 #, fuzzy msgid "SQL query value to result in critical status (double)" msgstr "Décalage résultant en un état critique (secondes)" -#: plugins/check_pgsql.c:540 +#: plugins/check_pgsql.c:549 msgid "All parameters are optional." msgstr "" -#: plugins/check_pgsql.c:541 +#: plugins/check_pgsql.c:550 msgid "" "This plugin tests a PostgreSQL DBMS to determine whether it is active and" msgstr "" -#: plugins/check_pgsql.c:542 +#: plugins/check_pgsql.c:551 msgid "accepting queries. In its current operation, it simply connects to the" msgstr "" -#: plugins/check_pgsql.c:543 +#: plugins/check_pgsql.c:552 msgid "" "specified database, and then disconnects. If no database is specified, it" msgstr "" -#: plugins/check_pgsql.c:544 +#: plugins/check_pgsql.c:553 msgid "" "connects to the template1 database, which is present in every functioning" msgstr "" -#: plugins/check_pgsql.c:545 +#: plugins/check_pgsql.c:554 msgid "PostgreSQL DBMS." msgstr "" -#: plugins/check_pgsql.c:547 +#: plugins/check_pgsql.c:556 msgid "If a query is specified using the -q option, it will be executed after" msgstr "" -#: plugins/check_pgsql.c:548 -msgid "connecting to the server. The result from the query has to be numeric." -msgstr "" - -#: plugins/check_pgsql.c:549 -msgid "" -"Multiple SQL commands, separated by semicolon, are allowed but the result " -msgstr "" - -#: plugins/check_pgsql.c:550 -msgid "of the last command is taken into account only. The value of the first" -msgstr "" - -#: plugins/check_pgsql.c:551 -msgid "column in the first row is used as the check result." -msgstr "" - -#: plugins/check_pgsql.c:553 -msgid "" -"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" -msgstr "" - -#: plugins/check_pgsql.c:554 -msgid "" -"for details about how to access internal statistics of the database server." -msgstr "" - -#: plugins/check_pgsql.c:556 -msgid "" -"For a list of available connection parameters which may be used with the -o" -msgstr "" - #: plugins/check_pgsql.c:557 -msgid "" -"command line option, see the documentation for PQconnectdb() in the chapter" +msgid "connecting to the server. The result from the query has to be numeric." msgstr "" #: plugins/check_pgsql.c:558 msgid "" -"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +"Multiple SQL commands, separated by semicolon, are allowed but the result " msgstr "" #: plugins/check_pgsql.c:559 +msgid "of the last command is taken into account only. The value of the first" +msgstr "" + +#: plugins/check_pgsql.c:560 +msgid "column in the first row is used as the check result." +msgstr "" + +#: plugins/check_pgsql.c:562 +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" +msgstr "" + +#: plugins/check_pgsql.c:563 +msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +#: plugins/check_pgsql.c:565 +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +#: plugins/check_pgsql.c:566 +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +#: plugins/check_pgsql.c:567 +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +#: plugins/check_pgsql.c:568 msgid "" "used to specify a service name in pg_service.conf to be used for additional" msgstr "" -#: plugins/check_pgsql.c:560 +#: plugins/check_pgsql.c:569 msgid "connection parameters: -o 'service=' or to specify the SSL mode:" msgstr "" -#: plugins/check_pgsql.c:561 +#: plugins/check_pgsql.c:570 msgid "-o 'sslmode=require'." msgstr "" -#: plugins/check_pgsql.c:563 +#: plugins/check_pgsql.c:572 msgid "" "The plugin will connect to a local postmaster if no host is specified. To" msgstr "" "Ce plugin va se connecter sur un postmaster local si aucun hôte n'est " "spécifié." -#: plugins/check_pgsql.c:564 +#: plugins/check_pgsql.c:573 msgid "" "connect to a remote host, be sure that the remote postmaster accepts TCP/IP" msgstr "" -#: plugins/check_pgsql.c:565 +#: plugins/check_pgsql.c:574 msgid "connections (start the postmaster with the -i option)." msgstr "" -#: plugins/check_pgsql.c:567 +#: plugins/check_pgsql.c:576 msgid "" "Typically, the monitoring user (unless the --logname option is used) should " "be" msgstr "" -#: plugins/check_pgsql.c:568 +#: plugins/check_pgsql.c:577 msgid "" "able to connect to the database without a password. The plugin can also send" msgstr "" -#: plugins/check_pgsql.c:569 +#: plugins/check_pgsql.c:578 msgid "a password, but no effort is made to obscure or encrypt the password." msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 #, c-format msgid "QUERY %s - %s: %s.\n" msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 msgid "Error with query" msgstr "" -#: plugins/check_pgsql.c:608 +#: plugins/check_pgsql.c:617 #, fuzzy msgid "No rows returned" msgstr "Pas de données valides reçues" -#: plugins/check_pgsql.c:613 +#: plugins/check_pgsql.c:622 #, fuzzy msgid "No columns returned" msgstr "Pas de données valides reçues" -#: plugins/check_pgsql.c:619 +#: plugins/check_pgsql.c:628 #, fuzzy msgid "No data returned" msgstr "Pas de données valides reçues" -#: plugins/check_pgsql.c:628 +#: plugins/check_pgsql.c:637 msgid "Is not a numeric" msgstr "" -#: plugins/check_pgsql.c:645 +#: plugins/check_pgsql.c:655 +#, fuzzy, c-format +msgid "%s returned %f" +msgstr ". %s renvoie %s" + +#: plugins/check_pgsql.c:658 #, fuzzy, c-format msgid "'%s' returned %f" msgstr ". %s renvoie %s" -#: plugins/check_ping.c:141 +#: plugins/check_ping.c:143 msgid "CRITICAL - Could not interpret output from ping command\n" msgstr "CRITIQUE - Impossible d'interpréter le réponse de la commande ping\n" -#: plugins/check_ping.c:157 +#: plugins/check_ping.c:159 #, c-format msgid "PING %s - %sPacket loss = %d%%" msgstr "PING %s - %s Paquets perdus = %d%%" -#: plugins/check_ping.c:160 +#: plugins/check_ping.c:162 #, c-format msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" msgstr "PING %s - %s Paquets perdus = %d%%, RTA = %2.2f ms" -#: plugins/check_ping.c:257 +#: plugins/check_ping.c:263 msgid "Could not realloc() addresses\n" msgstr "Impossible de réallouer les adresses\n" -#: plugins/check_ping.c:272 plugins/check_ping.c:352 +#: plugins/check_ping.c:278 plugins/check_ping.c:358 #, c-format msgid " (%s) must be a non-negative number\n" msgstr " (%s) doit être un nombre positif\n" -#: plugins/check_ping.c:306 +#: plugins/check_ping.c:312 #, c-format msgid " (%s) must be an integer percentage\n" msgstr " (%s) doit être un pourcentage entier\n" -#: plugins/check_ping.c:317 +#: plugins/check_ping.c:323 #, c-format msgid " (%s) must be an integer percentage\n" msgstr " (%s) doit être un pourcentage entier\n" -#: plugins/check_ping.c:328 +#: plugins/check_ping.c:334 #, c-format msgid " (%s) must be a non-negative number\n" msgstr " (%s) doit être un nombre positif\n" -#: plugins/check_ping.c:339 +#: plugins/check_ping.c:345 #, c-format msgid " (%s) must be a non-negative number\n" msgstr " (%s) doit être un nombre positif\n" -#: plugins/check_ping.c:372 +#: plugins/check_ping.c:378 #, c-format msgid "" "%s: Warning threshold must be integer or percentage!\n" "\n" msgstr "%s: Le seuil d'avertissement doit être un entier ou un pourcentage!\n" -#: plugins/check_ping.c:385 +#: plugins/check_ping.c:391 #, c-format msgid " was not set\n" msgstr " n'a pas été indiqué\n" -#: plugins/check_ping.c:389 +#: plugins/check_ping.c:395 #, c-format msgid " was not set\n" msgstr " n'a pas été indiqué\n" -#: plugins/check_ping.c:393 +#: plugins/check_ping.c:399 #, c-format msgid " was not set\n" msgstr " n'a pas été indiqué\n" -#: plugins/check_ping.c:397 +#: plugins/check_ping.c:403 #, c-format msgid " was not set\n" msgstr " n'a pas été indiqué\n" -#: plugins/check_ping.c:401 +#: plugins/check_ping.c:407 #, c-format msgid " (%f) cannot be larger than (%f)\n" msgstr " (%f) ne peut pas être plus large que (%f)\n" -#: plugins/check_ping.c:405 +#: plugins/check_ping.c:411 #, c-format msgid " (%d) cannot be larger than (%d)\n" msgstr " (%d) ne peut pas être plus large que (%d)\n" -#: plugins/check_ping.c:442 +#: plugins/check_ping.c:448 #, c-format msgid "Cannot open stderr for %s\n" msgstr "Impossible d'ouvrir le canal d'erreur standard pour %s\n" -#: plugins/check_ping.c:499 plugins/check_ping.c:501 +#: plugins/check_ping.c:505 plugins/check_ping.c:507 msgid "System call sent warnings to stderr " msgstr "" "Les appel système enverront leurs messages d'avertissement vers le canal " "d'erreur standard" -#: plugins/check_ping.c:526 +#: plugins/check_ping.c:533 #, fuzzy, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "CRITIQUE - Le réseau est inaccessible (%s)" -#: plugins/check_ping.c:528 +#: plugins/check_ping.c:535 #, fuzzy, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "CRITIQUE - Hôte inaccessible (%s)" -#: plugins/check_ping.c:530 +#: plugins/check_ping.c:537 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "CRITIQUE - Paquet ICMP incorrect: Port inaccessible (%s)" -#: plugins/check_ping.c:532 +#: plugins/check_ping.c:539 #, fuzzy, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "CRITIQUE - Paquet ICMP incorrect: Protocole inaccessible (%s)" -#: plugins/check_ping.c:534 +#: plugins/check_ping.c:541 #, fuzzy, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "CRITIQUE - L'accès au réseau est interdit (%s)" -#: plugins/check_ping.c:536 +#: plugins/check_ping.c:543 #, fuzzy, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "CRITIQUE - L'accès a l'hôte est interdit (%s)" -#: plugins/check_ping.c:538 +#: plugins/check_ping.c:545 #, fuzzy, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "CRITIQUE - Paquet filtré (%s)" -#: plugins/check_ping.c:540 +#: plugins/check_ping.c:547 #, fuzzy, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "CRITIQUE - Hôte non trouvé (%s)" -#: plugins/check_ping.c:542 +#: plugins/check_ping.c:549 #, fuzzy, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "CRITIQUE - La durée de vie du paquet est dépassée (%s)" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 #, fuzzy, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "CRITIQUE - Hôte inaccessible (%s)" -#: plugins/check_ping.c:551 +#: plugins/check_ping.c:558 #, fuzzy msgid "Unable to realloc warn_text\n" msgstr "Impossible de réattribuer le texte d'avertissement" -#: plugins/check_ping.c:568 +#: plugins/check_ping.c:575 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" "Utilise ping pour vérifier les statistiques de connections d'un hôte distant." -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 msgid "host to ping" msgstr "hôte à tester" -#: plugins/check_ping.c:586 +#: plugins/check_ping.c:593 msgid "number of ICMP ECHO packets to send" msgstr "nombre de paquets ICMP à envoyer" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 #, c-format msgid "(Default: %d)\n" msgstr "(Défaut: %d)\n" -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" "Le seuil est ,% où est le temps moyen pour l'aller retour (ms)" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "qui déclenche un résultat AVERTISSEMENT ou CRITIQUE, et est le " -#: plugins/check_ping.c:596 +#: plugins/check_ping.c:603 msgid "percentage of packet loss to trigger an alarm state." msgstr "pourcentage de paquets perdus pour déclencher une alarme." -#: plugins/check_ping.c:599 +#: plugins/check_ping.c:606 msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "" "Ce plugin utilise la commande ping pour vérifier l'hôte spécifié pour les " "pertes de paquets" -#: plugins/check_ping.c:600 +#: plugins/check_ping.c:607 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:601 +#: plugins/check_ping.c:608 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:602 +#: plugins/check_ping.c:609 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" @@ -4334,8 +4403,7 @@ msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" #: plugins/check_procs.c:778 -#, c-format -msgid "Alert if CPU of any processes over 10%% or 20%%" +msgid "Alert if CPU of any processes over 10% or 20%" msgstr "" #: plugins/check_radius.c:177 @@ -4353,7 +4421,7 @@ msgstr "Manque de Mémoire?" msgid "Invalid NAS-Identifier\n" msgstr "NAS-Identifier invalide" -#: plugins/check_radius.c:195 plugins/check_smtp.c:151 +#: plugins/check_radius.c:195 plugins/check_smtp.c:153 #, c-format msgid "gethostname() failed!\n" msgstr "La commande gethostname() à échoué\n" @@ -4514,11 +4582,11 @@ msgstr "Pas de données reçues de l'hôte\n" msgid "REAL %s - %d second response time\n" msgstr "REAL %s - %d secondes de temps de réponse\n" -#: plugins/check_real.c:337 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:539 msgid "Warning time must be a positive integer" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_real.c:346 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:530 msgid "Critical time must be a positive integer" msgstr "Le seuil critique doit être un entier positif" @@ -4544,7 +4612,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte." -#: plugins/check_real.c:439 plugins/check_smtp.c:837 +#: plugins/check_real.c:439 plugins/check_smtp.c:847 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -4562,526 +4630,567 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:147 plugins/check_swap.c:266 plugins/check_swap.c:272 +#: plugins/check_smtp.c:149 plugins/check_swap.c:286 plugins/check_swap.c:292 #, c-format msgid "malloc() failed!\n" msgstr "l'allocation mémoire à échoué!\n" -#: plugins/check_smtp.c:186 plugins/check_smtp.c:198 +#: plugins/check_smtp.c:190 plugins/check_smtp.c:202 #, c-format msgid "recv() failed\n" msgstr "La commande recv() à échoué\n" -#: plugins/check_smtp.c:208 +#: plugins/check_smtp.c:212 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "AVERTISSEMENT: - TLS n'est pas supporté par ce serveur\n" -#: plugins/check_smtp.c:220 +#: plugins/check_smtp.c:224 #, c-format msgid "Server does not support STARTTLS\n" msgstr "Le serveur ne supporte pas STARTTLS\n" -#: plugins/check_smtp.c:226 +#: plugins/check_smtp.c:230 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "CRITIQUE - Impossible de créer le contexte SSL.\n" -#: plugins/check_smtp.c:246 +#: plugins/check_smtp.c:250 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:251 +#: plugins/check_smtp.c:255 #, c-format msgid "sent %s" msgstr "envoyé %s" -#: plugins/check_smtp.c:253 +#: plugins/check_smtp.c:257 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:283 +#: plugins/check_smtp.c:287 #, c-format msgid "Invalid SMTP response received from host: %s\n" msgstr "Réponse SMTP reçue de l'hôte invalide: %s\n" -#: plugins/check_smtp.c:285 +#: plugins/check_smtp.c:289 #, c-format msgid "Invalid SMTP response received from host on port %d: %s\n" msgstr "Réponse SMTP reçue de l'hôte sur le port %d invalide: %s\n" -#: plugins/check_smtp.c:308 plugins/check_snmp.c:834 +#: plugins/check_smtp.c:312 plugins/check_snmp.c:855 #, c-format msgid "Could Not Compile Regular Expression" msgstr "Impossible de compiler l'expression rationnelle" -#: plugins/check_smtp.c:317 +#: plugins/check_smtp.c:321 #, c-format msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "SMTP %s - réponse invalide de '%s' à la commande '%s'\n" -#: plugins/check_smtp.c:321 plugins/check_snmp.c:520 +#: plugins/check_smtp.c:325 plugins/check_snmp.c:532 #, c-format msgid "Execute Error: %s\n" msgstr "Erreur d'exécution: %s\n" -#: plugins/check_smtp.c:335 +#: plugins/check_smtp.c:339 msgid "no authuser specified, " msgstr "Pas d'utilisateur pour l'authentification spécifié, " -#: plugins/check_smtp.c:340 +#: plugins/check_smtp.c:344 msgid "no authpass specified, " msgstr "pas de mot de passe spécifié, " -#: plugins/check_smtp.c:347 plugins/check_smtp.c:368 plugins/check_smtp.c:388 -#: plugins/check_smtp.c:693 +#: plugins/check_smtp.c:351 plugins/check_smtp.c:372 plugins/check_smtp.c:392 +#: plugins/check_smtp.c:701 #, c-format msgid "sent %s\n" msgstr "envoyé %s\n" -#: plugins/check_smtp.c:350 +#: plugins/check_smtp.c:354 msgid "recv() failed after AUTH LOGIN, " msgstr "recv() à échoué après AUTH LOGIN, " -#: plugins/check_smtp.c:355 plugins/check_smtp.c:376 plugins/check_smtp.c:396 -#: plugins/check_smtp.c:704 +#: plugins/check_smtp.c:359 plugins/check_smtp.c:380 plugins/check_smtp.c:400 +#: plugins/check_smtp.c:712 #, c-format msgid "received %s\n" msgstr "reçu %s\n" -#: plugins/check_smtp.c:359 +#: plugins/check_smtp.c:363 msgid "invalid response received after AUTH LOGIN, " msgstr "Réponse invalide reçue après AUTH LOGIN, " -#: plugins/check_smtp.c:372 +#: plugins/check_smtp.c:376 msgid "recv() failed after sending authuser, " msgstr "La commande recv() a échoué après authuser, " -#: plugins/check_smtp.c:380 +#: plugins/check_smtp.c:384 msgid "invalid response received after authuser, " msgstr "Réponse invalide reçue après authuser, " -#: plugins/check_smtp.c:392 +#: plugins/check_smtp.c:396 msgid "recv() failed after sending authpass, " msgstr "la commande recv() à échoué après authpass, " -#: plugins/check_smtp.c:400 +#: plugins/check_smtp.c:404 msgid "invalid response received after authpass, " msgstr "Réponse invalide reçue après authpass, " -#: plugins/check_smtp.c:407 +#: plugins/check_smtp.c:411 msgid "only authtype LOGIN is supported, " msgstr "seul la méthode d'authentification LOGIN est supportée, " -#: plugins/check_smtp.c:431 +#: plugins/check_smtp.c:435 #, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr "SMTP %s - %s%.3f sec. de temps de réponse%s%s|%s\n" -#: plugins/check_smtp.c:541 plugins/check_smtp.c:553 +#: plugins/check_smtp.c:546 plugins/check_smtp.c:558 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "Impossible de réallouer des unités [%d]\n" -#: plugins/check_smtp.c:561 +#: plugins/check_smtp.c:566 #, fuzzy msgid "Critical time must be a positive" msgstr "Le seuil critique doit être un entier positif" -#: plugins/check_smtp.c:569 +#: plugins/check_smtp.c:574 #, fuzzy msgid "Warning time must be a positive" msgstr "Le seuil d'avertissement doit être un entier positif" -#: plugins/check_smtp.c:612 +#: plugins/check_smtp.c:617 msgid "SSL support not available - install OpenSSL and recompile" msgstr "SSL n'est pas disponible - installer OpenSSL et recompilez" -#: plugins/check_smtp.c:684 plugins/check_smtp.c:689 +#: plugins/check_smtp.c:692 plugins/check_smtp.c:697 #, c-format msgid "Connection closed by server before sending QUIT command\n" msgstr "" -#: plugins/check_smtp.c:699 +#: plugins/check_smtp.c:707 #, c-format msgid "recv() failed after QUIT." msgstr "recv() à échoué après QUIT." -#: plugins/check_smtp.c:701 +#: plugins/check_smtp.c:709 #, c-format msgid "Connection reset by peer." msgstr "" -#: plugins/check_smtp.c:791 +#: plugins/check_smtp.c:799 msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "Ce plugin va essayer d'ouvrir un connexion SMTP avec l'hôte." -#: plugins/check_smtp.c:805 +#: plugins/check_smtp.c:813 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" " Texte attendu dans la première ligne de réponse du serveur (défaut: " "'%s')\n" -#: plugins/check_smtp.c:807 +#: plugins/check_smtp.c:815 msgid "SMTP command (may be used repeatedly)" msgstr "Commande SMTP (peut être utilisé plusieurs fois)" -#: plugins/check_smtp.c:809 +#: plugins/check_smtp.c:817 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:811 +#: plugins/check_smtp.c:819 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:813 +#: plugins/check_smtp.c:821 msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:816 plugins/check_tcp.c:689 +#: plugins/check_smtp.c:824 plugins/check_tcp.c:689 msgid "Minimum number of days a certificate has to be valid." msgstr "Nombre de jours minimum pour que le certificat soit valide." -#: plugins/check_smtp.c:818 +#: plugins/check_smtp.c:826 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:822 +#: plugins/check_smtp.c:830 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:824 +#: plugins/check_smtp.c:832 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:826 +#: plugins/check_smtp.c:834 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:828 -msgid "Ignore failure when sending QUIT command to server" +#: plugins/check_smtp.c:836 +msgid "Send LHLO instead of HELO/EHLO" msgstr "" #: plugins/check_smtp.c:838 +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +#: plugins/check_smtp.c:848 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:839 +#: plugins/check_smtp.c:849 msgid "connects, but incorrect response messages from the host result in" msgstr "" -#: plugins/check_smtp.c:840 +#: plugins/check_smtp.c:850 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:171 plugins/check_snmp.c:604 +#: plugins/check_snmp.c:172 plugins/check_snmp.c:618 msgid "Cannot malloc" msgstr "" -#: plugins/check_snmp.c:362 +#: plugins/check_snmp.c:363 #, c-format msgid "External command error: %s\n" msgstr "Erreur d'exécution de commande externe: %s\n" -#: plugins/check_snmp.c:367 +#: plugins/check_snmp.c:368 #, c-format msgid "External command error with no output (return code: %d)\n" msgstr "" -#: plugins/check_snmp.c:473 +#: plugins/check_snmp.c:478 plugins/check_snmp.c:480 plugins/check_snmp.c:482 +#: plugins/check_snmp.c:484 #, fuzzy, c-format msgid "No valid data returned (%s)\n" msgstr "Pas de données valides reçues" -#: plugins/check_snmp.c:484 +#: plugins/check_snmp.c:496 msgid "Time duration between plugin calls is invalid" msgstr "" -#: plugins/check_snmp.c:610 +#: plugins/check_snmp.c:624 msgid "Cannot asprintf()" msgstr "" -#: plugins/check_snmp.c:616 +#: plugins/check_snmp.c:630 #, fuzzy msgid "Cannot realloc()" msgstr "Impossible de réallouer des unités\n" -#: plugins/check_snmp.c:632 +#: plugins/check_snmp.c:646 msgid "No previous data to calculate rate - assume okay" msgstr "" -#: plugins/check_snmp.c:779 +#: plugins/check_snmp.c:794 msgid "Retries interval must be a positive integer" msgstr "L'intervalle pour les essais doit être un entier positif" -#: plugins/check_snmp.c:859 +#: plugins/check_snmp.c:831 +#, fuzzy +msgid "Exit status must be a positive integer" +msgstr "Maxbytes doit être un entier positif" + +#: plugins/check_snmp.c:880 #, c-format msgid "Could not reallocate labels[%d]" msgstr "Impossible de réallouer des labels[%d]" -#: plugins/check_snmp.c:872 +#: plugins/check_snmp.c:893 msgid "Could not reallocate labels\n" msgstr "Impossible de réallouer des labels\n" -#: plugins/check_snmp.c:888 +#: plugins/check_snmp.c:909 #, c-format msgid "Could not reallocate units [%d]\n" msgstr "Impossible de réallouer des unités [%d]\n" -#: plugins/check_snmp.c:900 +#: plugins/check_snmp.c:921 msgid "Could not realloc() units\n" msgstr "Impossible de réallouer des unités\n" -#: plugins/check_snmp.c:917 +#: plugins/check_snmp.c:938 #, fuzzy msgid "Rate multiplier must be a positive integer" msgstr "La taille du paquet doit être un entier positif" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:1003 msgid "No host specified\n" msgstr "Pas d'hôte spécifié\n" -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:1007 msgid "No OIDs specified\n" msgstr "Pas de compteur spécifié\n" -#: plugins/check_snmp.c:1009 plugins/check_snmp.c:1027 -#: plugins/check_snmp.c:1045 +#: plugins/check_snmp.c:1030 plugins/check_snmp.c:1048 +#: plugins/check_snmp.c:1066 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1020 +#: plugins/check_snmp.c:1041 msgid "Invalid seclevel" msgstr "" -#: plugins/check_snmp.c:1066 +#: plugins/check_snmp.c:1087 msgid "Invalid SNMP version" msgstr "Version de SNMP invalide" -#: plugins/check_snmp.c:1083 +#: plugins/check_snmp.c:1104 msgid "Unbalanced quotes\n" msgstr "Guillemets manquants\n" -#: plugins/check_snmp.c:1132 +#: plugins/check_snmp.c:1153 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" "Vérifie l'état des machines distantes et obtient l'information système via " "SNMP" -#: plugins/check_snmp.c:1146 +#: plugins/check_snmp.c:1167 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "Utiliser SNMP GETNEXT au lieu de SNMP GET" -#: plugins/check_snmp.c:1148 +#: plugins/check_snmp.c:1169 msgid "SNMP protocol version" msgstr "Version du protocole SNMP" -#: plugins/check_snmp.c:1150 +#: plugins/check_snmp.c:1171 #, fuzzy msgid "SNMPv3 context" msgstr "Nom d'utilisateur SNMPv3" -#: plugins/check_snmp.c:1152 +#: plugins/check_snmp.c:1173 msgid "SNMPv3 securityLevel" msgstr "Niveau de sécurité SNMPv3 (securityLevel)" -#: plugins/check_snmp.c:1154 +#: plugins/check_snmp.c:1175 msgid "SNMPv3 auth proto" msgstr "Protocole d'authentification SNMPv3" -#: plugins/check_snmp.c:1156 +#: plugins/check_snmp.c:1177 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1160 +#: plugins/check_snmp.c:1181 msgid "Optional community string for SNMP communication" msgstr "Communauté optionnelle pour la communication SNMP" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1182 msgid "default is" msgstr "défaut:" -#: plugins/check_snmp.c:1163 +#: plugins/check_snmp.c:1184 msgid "SNMPv3 username" msgstr "Nom d'utilisateur SNMPv3" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1186 msgid "SNMPv3 authentication password" msgstr "Mot de passe d'authentification SNMPv3" -#: plugins/check_snmp.c:1167 +#: plugins/check_snmp.c:1188 msgid "SNMPv3 privacy password" msgstr "Mot de passe de confidentialité SNMPv3" -#: plugins/check_snmp.c:1171 +#: plugins/check_snmp.c:1192 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1194 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1195 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1176 +#: plugins/check_snmp.c:1197 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1177 +#: plugins/check_snmp.c:1198 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1178 +#: plugins/check_snmp.c:1199 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1182 +#: plugins/check_snmp.c:1201 +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +#: plugins/check_snmp.c:1202 +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +#: plugins/check_snmp.c:1203 +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +#: plugins/check_snmp.c:1204 +msgid "0 = OK" +msgstr "" + +#: plugins/check_snmp.c:1205 +#, fuzzy +msgid "1 = WARNING" +msgstr "AVERTISSEMENT" + +#: plugins/check_snmp.c:1206 +#, fuzzy +msgid "2 = CRITICAL" +msgstr "CRITIQUE" + +#: plugins/check_snmp.c:1207 +#, fuzzy +msgid "3 = UNKNOWN" +msgstr "INCONNU" + +#: plugins/check_snmp.c:1211 msgid "Warning threshold range(s)" msgstr "Valeurs pour le seuil d'avertissement" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1213 msgid "Critical threshold range(s)" msgstr "Valeurs pour le seuil critique" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1215 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1188 +#: plugins/check_snmp.c:1217 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1219 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1223 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1225 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:1198 +#: plugins/check_snmp.c:1227 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:1200 +#: plugins/check_snmp.c:1229 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1204 +#: plugins/check_snmp.c:1233 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1206 +#: plugins/check_snmp.c:1235 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1208 +#: plugins/check_snmp.c:1237 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1211 +#: plugins/check_snmp.c:1240 msgid "" "NOTE the final timeout value is calculated using this formula: " "timeout_interval * retries + 5" msgstr "" -#: plugins/check_snmp.c:1213 +#: plugins/check_snmp.c:1242 #, fuzzy msgid "Number of retries to be used in the requests, default: " msgstr "Le nombre d'essai pour les requêtes" -#: plugins/check_snmp.c:1216 +#: plugins/check_snmp.c:1245 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1221 +#: plugins/check_snmp.c:1250 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1222 +#: plugins/check_snmp.c:1251 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" "Si vous n'avez pas le programme installé, vous devrez le télécharger depuis" -#: plugins/check_snmp.c:1223 +#: plugins/check_snmp.c:1252 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "http://net-snmp.sourceforge.net avant de pouvoir utiliser ce plugin." -#: plugins/check_snmp.c:1227 +#: plugins/check_snmp.c:1256 #, fuzzy msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" "- Des OIDs multiples peuvent être séparées par des virgules ou des espaces" -#: plugins/check_snmp.c:1228 +#: plugins/check_snmp.c:1257 #, fuzzy msgid "list (lists with internal spaces must be quoted)." msgstr "(Les liste avec espaces doivent être entre guillemets). Max:" -#: plugins/check_snmp.c:1232 +#: plugins/check_snmp.c:1261 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1233 +#: plugins/check_snmp.c:1262 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1234 +#: plugins/check_snmp.c:1263 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1235 +#: plugins/check_snmp.c:1264 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1238 +#: plugins/check_snmp.c:1267 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1239 +#: plugins/check_snmp.c:1268 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1240 +#: plugins/check_snmp.c:1269 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1241 +#: plugins/check_snmp.c:1270 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1242 +#: plugins/check_snmp.c:1271 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1243 +#: plugins/check_snmp.c:1272 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1244 +#: plugins/check_snmp.c:1273 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1245 +#: plugins/check_snmp.c:1274 msgid "changing the arguments will create a new state file." msgstr "" @@ -5131,56 +5240,68 @@ msgstr "" "AVERTISSEMENT si la chaîne ne correspond pas à la version précisée (ex: " "OpenSSH_3.9p1)" -#: plugins/check_swap.c:170 +#: plugins/check_swap.c:190 #, c-format msgid "Command: %s\n" msgstr "Commande: %s\n" -#: plugins/check_swap.c:172 +#: plugins/check_swap.c:192 #, c-format msgid "Format: %s\n" msgstr "Format: %s\n" -#: plugins/check_swap.c:208 +#: plugins/check_swap.c:228 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "total=%.0f, utilisé=%.0f, libre=%.0ff\n" -#: plugins/check_swap.c:222 +#: plugins/check_swap.c:242 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "total=%.0f, libre=%.0f\n" -#: plugins/check_swap.c:254 +#: plugins/check_swap.c:274 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:257 +#: plugins/check_swap.c:277 msgid "SWAP OK: No swap devices defined\n" msgstr "SWAP OK: Pas de périphériques swap définis\n" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:298 plugins/check_swap.c:340 msgid "swapctl failed: " msgstr "swapctl à échoué:" -#: plugins/check_swap.c:279 plugins/check_swap.c:321 +#: plugins/check_swap.c:299 plugins/check_swap.c:341 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:359 -#, c-format -msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" +#: plugins/check_swap.c:379 +#, fuzzy, c-format +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" msgstr "SWAP %s - %d%% libre (%d MB sur un total de %d MB) %s|" -#: plugins/check_swap.c:441 -msgid "Warning threshold must be integer or percentage!" +#: plugins/check_swap.c:475 +#, fuzzy +msgid "Warning threshold percentage must be <= 100!" +msgstr "Le seuil d'avertissement doit être un entier positif" + +#: plugins/check_swap.c:485 +#, fuzzy +msgid "Warning threshold be positive integer or percentage!" msgstr "Le seuil d'avertissement doit être un entier ou un pourcentage!" -#: plugins/check_swap.c:459 -msgid "Critical threshold must be integer or percentage!" +#: plugins/check_swap.c:505 +#, fuzzy +msgid "Critical threshold percentage must be <= 100!" +msgstr "le seuil critique doit être un entier positif" + +#: plugins/check_swap.c:515 +#, fuzzy +msgid "Critical threshold be positive integer or percentage!" msgstr "Le seuil critique doit être un entier ou un pourcentage!" -#: plugins/check_swap.c:466 +#: plugins/check_swap.c:524 #, fuzzy msgid "" "no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " @@ -5189,65 +5310,60 @@ msgstr "" "Le résultat de temps dépassé doit être un nom d'état valide (OK, WARNING, " "CRITICAL, UNKNOWN) ou un nombre entier (0-3)." -#: plugins/check_swap.c:517 -msgid "Warning percentage should be more than critical percentage" +#: plugins/check_swap.c:561 +#, fuzzy +msgid "Warning should be more than critical" msgstr "" "Le pourcentage d'avertissement doit être plus important que le pourcentage " "critique" -#: plugins/check_swap.c:521 -msgid "Warning free space should be more than critical free space" -msgstr "" -"Le seuil d'avertissement pour la place libre doit être plus grand que le " -"seuil critique" - -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:575 msgid "Check swap space on local machine." msgstr "Vérifie l'espace swap sur la machine locale." -#: plugins/check_swap.c:545 +#: plugins/check_swap.c:585 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X octets de mémoire " "virtuelle sont libres" -#: plugins/check_swap.c:547 +#: plugins/check_swap.c:587 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" "Sortir avec un résultat AVERTISSEMENT si moins de X pour cent de mémoire " "virtuelle est libre" -#: plugins/check_swap.c:549 +#: plugins/check_swap.c:589 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X octets de mémoire virtuelle " "sont libres" -#: plugins/check_swap.c:551 +#: plugins/check_swap.c:591 #, fuzzy msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" "Sortir avec un résultat CRITIQUE si moins de X pour cent de mémoire " "virtuelle est libre" -#: plugins/check_swap.c:553 +#: plugins/check_swap.c:593 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "Vérifier chacune des partitions de mémoire virtuelle séparément" -#: plugins/check_swap.c:555 +#: plugins/check_swap.c:595 msgid "" "Resulting state when there is no swap regardless of thresholds. Default:" msgstr "" -#: plugins/check_swap.c:560 +#: plugins/check_swap.c:600 #, fuzzy msgid "" "Both INTEGER and PERCENT thresholds can be specified, they are all checked." msgstr "Les seuils d'alerte et critiques peuvent être spécifiés avec -w et -c." -#: plugins/check_swap.c:561 +#: plugins/check_swap.c:601 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" "Sur AIX, si -a est spécifié, le plugin utilise lsps -a, sinon il utilise " @@ -5486,116 +5602,120 @@ msgstr ", Inconnu" msgid "UPS does not support any available options\n" msgstr "L'UPS ne supporte aucune des options disponibles\n" -#: plugins/check_ups.c:348 plugins/check_ups.c:411 +#: plugins/check_ups.c:348 plugins/check_ups.c:414 msgid "Invalid response received from host" msgstr "Réponse invalide reçue de l'hôte" -#: plugins/check_ups.c:420 +#: plugins/check_ups.c:406 +msgid "UPS name to long for buffer" +msgstr "" + +#: plugins/check_ups.c:423 #, c-format msgid "CRITICAL - no such UPS '%s' on that host\n" msgstr "CRITIQUE - pas d'UPS '%s' sur cet hôte\n" -#: plugins/check_ups.c:430 +#: plugins/check_ups.c:433 msgid "CRITICAL - UPS data is stale" msgstr "CRITIQUE - les données de l'ups ne sont plus valables" -#: plugins/check_ups.c:435 +#: plugins/check_ups.c:438 #, c-format msgid "Unknown error: %s\n" msgstr "Erreur inconnue: %s\n" -#: plugins/check_ups.c:442 +#: plugins/check_ups.c:445 msgid "Error: unable to parse variable" msgstr "Erreur: impossible de lire la variable" -#: plugins/check_ups.c:549 +#: plugins/check_ups.c:552 msgid "Unrecognized UPS variable" msgstr "Variable d'UPS non reconnue" -#: plugins/check_ups.c:587 +#: plugins/check_ups.c:590 msgid "Error : no UPS indicated" msgstr "Erreur: pas d'UPS indiqué" -#: plugins/check_ups.c:607 +#: plugins/check_ups.c:610 msgid "" "This plugin tests the UPS service on the specified host. Network UPS Tools" msgstr "Ce plugin teste le service UPS sur l'hôte spécifié. Network UPS Tools" -#: plugins/check_ups.c:608 +#: plugins/check_ups.c:611 msgid "from www.networkupstools.org must be running for this plugin to work." msgstr "" "de www.networkupstools.org doit s'exécuter sur l'hôte pour que ce plugin " "fonctionne." -#: plugins/check_ups.c:620 +#: plugins/check_ups.c:623 msgid "Name of UPS" msgstr "" -#: plugins/check_ups.c:622 +#: plugins/check_ups.c:625 msgid "Output of temperatures in Celsius" msgstr "Affichage des températures en Celsius" -#: plugins/check_ups.c:624 +#: plugins/check_ups.c:627 msgid "Valid values for STRING are" msgstr "Les variables valides pour STRING sont" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:638 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:636 +#: plugins/check_ups.c:639 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:640 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:641 msgid "" "state. If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:646 msgid "" "You may also specify a variable to check (such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:647 msgid "" "battery load, etc.) as well as warning and critical thresholds for the value" msgstr "" -#: plugins/check_ups.c:645 +#: plugins/check_ups.c:648 msgid "" "of that variable. If the remote host has multiple UPS that are being " "monitored" msgstr "" -#: plugins/check_ups.c:646 +#: plugins/check_ups.c:649 msgid "you will have to use the --ups option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:648 +#: plugins/check_ups.c:651 msgid "" "This plugin requires that the UPSD daemon distributed with Russell Kroll's" msgstr "" -#: plugins/check_ups.c:649 +#: plugins/check_ups.c:652 msgid "" "Network UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:650 +#: plugins/check_ups.c:653 msgid "package installed on your system, you can download it from" msgstr "" -#: plugins/check_ups.c:651 +#: plugins/check_ups.c:654 msgid "http://www.networkupstools.org" msgstr "" @@ -6037,24 +6157,24 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:437 +#: plugins/utils.c:479 msgid "failed realloc in strpcpy\n" msgstr "La fonction realloc à échoué dans strpcpy\n" -#: plugins/utils.c:479 +#: plugins/utils.c:521 msgid "failed malloc in strscat\n" msgstr "La fonction malloc à échoué dans strscat\n" -#: plugins/utils.c:499 +#: plugins/utils.c:541 #, fuzzy msgid "failed malloc in xvasprintf\n" msgstr "La fonction malloc à échoué dans strscat\n" -#: plugins/utils.c:693 +#: plugins/utils.c:819 msgid "sysconf error for _SC_OPEN_MAX\n" msgstr "" -#: plugins/utils.h:118 +#: plugins/utils.h:127 #, c-format msgid "" " %s (-h | --help) for detailed help\n" @@ -6063,7 +6183,7 @@ msgstr "" " %s (-h | --help) pour l'aide détaillée\n" " %s (-V | --version) pour les informations relative à la version\n" -#: plugins/utils.h:122 +#: plugins/utils.h:131 msgid "" "\n" "Options:\n" @@ -6079,7 +6199,7 @@ msgstr "" " -V, --version\n" " Afficher les informations relative à la version\n" -#: plugins/utils.h:129 +#: plugins/utils.h:138 #, c-format msgid "" " -H, --hostname=ADDRESS\n" @@ -6092,7 +6212,7 @@ msgstr "" " -%c, --port=INTEGER\n" " Numéro de port (défaut: %s)\n" -#: plugins/utils.h:135 +#: plugins/utils.h:144 msgid "" " -4, --use-ipv4\n" " Use IPv4 connection\n" @@ -6104,7 +6224,7 @@ msgstr "" " -6, --use-ipv6\n" " Utiliser une connection IPv6\n" -#: plugins/utils.h:141 +#: plugins/utils.h:150 #, fuzzy msgid "" " -v, --verbose\n" @@ -6115,7 +6235,7 @@ msgstr "" " Affiche les informations de déboguage en ligne de commande (Nagios peut " "tronquer la sortie)\n" -#: plugins/utils.h:146 +#: plugins/utils.h:155 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -6127,7 +6247,7 @@ msgstr "" " -c, --critical=DOUBLE\n" " Temps de réponse résultant en un état critique (secondes)\n" -#: plugins/utils.h:152 +#: plugins/utils.h:161 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -6140,7 +6260,7 @@ msgstr "" " -c, --critical=RANGE\n" " Seuil critique\n" -#: plugins/utils.h:158 +#: plugins/utils.h:167 #, c-format msgid "" " -t, --timeout=INTEGER\n" @@ -6149,7 +6269,7 @@ msgstr "" " -t, --timeout=INTEGER\n" " Délais de connection en secondes (défaut: %d)\n" -#: plugins/utils.h:162 +#: plugins/utils.h:171 #, fuzzy, c-format msgid "" " -t, --timeout=INTEGER\n" @@ -6158,7 +6278,7 @@ msgstr "" " -t, --timeout=INTEGER\n" " Délais de connection en secondes (défaut: %d)\n" -#: plugins/utils.h:167 +#: plugins/utils.h:176 #, fuzzy msgid "" " --extra-opts=[section][@file]\n" @@ -6171,7 +6291,7 @@ msgstr "" " https://www.monitoring-plugins.org/doc/extra-opts.html\n" " pour les instructions et examples.\n" -#: plugins/utils.h:176 +#: plugins/utils.h:185 #, fuzzy msgid "" " See:\n" @@ -6183,7 +6303,7 @@ msgstr "" "html#THRESHOLDFORMAT\n" " pour le format et examples des seuils (THRESHOLD).\n" -#: plugins/utils.h:181 +#: plugins/utils.h:190 #, fuzzy msgid "" "\n" @@ -6199,7 +6319,7 @@ msgstr "" "améliorations, envoyez un email à devel@monitoring-plugins.org\n" "\n" -#: plugins/utils.h:186 +#: plugins/utils.h:195 #, fuzzy msgid "" "\n" @@ -6523,15 +6643,15 @@ msgstr "" msgid "" "Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n" msgstr "" -"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/open" -"(%s..): %s.\n" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_attach_req/" +"open(%s..): %s.\n" #: plugins-root/check_dhcp.c:1267 #, c-format msgid "Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n" msgstr "" -"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/check_ctrl" -"(): %s.\n" +"Erreur: Impossible d'obtenir la MAC par l'API DLPI dans dl_bind/" +"check_ctrl(): %s.\n" #: plugins-root/check_dhcp.c:1346 #, c-format @@ -6566,86 +6686,86 @@ msgstr "" msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1554 +#: plugins-root/check_icmp.c:1569 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1556 +#: plugins-root/check_icmp.c:1571 msgid "Use IPv4 (default) or IPv6 to communicate with the targets" msgstr "" -#: plugins-root/check_icmp.c:1558 +#: plugins-root/check_icmp.c:1573 msgid "warning threshold (currently " msgstr "Valeurs pour le seuil d'avertissement (actuellement " -#: plugins-root/check_icmp.c:1561 +#: plugins-root/check_icmp.c:1576 msgid "critical threshold (currently " msgstr "Valeurs pour le seuil critique (actuellement " -#: plugins-root/check_icmp.c:1564 +#: plugins-root/check_icmp.c:1579 msgid "specify a source IP address or device name" msgstr "spécifiez une adresse ou un nom d'hôte" -#: plugins-root/check_icmp.c:1566 +#: plugins-root/check_icmp.c:1581 msgid "number of packets to send (currently " msgstr "nombre de paquets à envoyer (actuellement " -#: plugins-root/check_icmp.c:1569 +#: plugins-root/check_icmp.c:1584 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1572 +#: plugins-root/check_icmp.c:1587 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1575 +#: plugins-root/check_icmp.c:1590 msgid "number of alive hosts required for success" msgstr "nombre d'hôtes vivants requis pour réussite" -#: plugins-root/check_icmp.c:1578 +#: plugins-root/check_icmp.c:1593 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1581 +#: plugins-root/check_icmp.c:1596 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1584 +#: plugins-root/check_icmp.c:1599 msgid "Number of icmp data bytes to send" msgstr "Nombre de paquets ICMP à envoyer" -#: plugins-root/check_icmp.c:1585 +#: plugins-root/check_icmp.c:1600 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1587 +#: plugins-root/check_icmp.c:1602 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1591 +#: plugins-root/check_icmp.c:1606 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1593 +#: plugins-root/check_icmp.c:1608 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1594 +#: plugins-root/check_icmp.c:1609 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1595 +#: plugins-root/check_icmp.c:1610 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1596 +#: plugins-root/check_icmp.c:1611 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1602 +#: plugins-root/check_icmp.c:1617 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" @@ -6671,15 +6791,15 @@ msgstr "" #~ msgid "Can't find local IP for NAS-IP-Address" #~ msgstr "Impossible de trouver une addresse IP locale pour le NAS-IP-Address" +#~ msgid "Warning free space should be more than critical free space" +#~ msgstr "" +#~ "Le seuil d'avertissement pour la place libre doit être plus grand que le " +#~ "seuil critique" + +#, c-format #~ msgid "%s - Plugin timed out after %d seconds\n" #~ msgstr "%s - Le plugin n'as pas répondu dans les %d secondes\n" -#~ msgid "Critical threshold must be integer" -#~ msgstr "le seuil critique doit être un entier positif" - -#~ msgid "Warning threshold must be integer" -#~ msgstr "Le seuil d'avertissement doit être un entier positif" - #~ msgid "Critical Process Count must be an integer!" #~ msgstr "Critique Le total des processus doit être un nombre entier!" diff --git a/po/monitoring-plugins.pot b/po/monitoring-plugins.pot index 646efe0..c8ff344 100644 --- a/po/monitoring-plugins.pot +++ b/po/monitoring-plugins.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: devel@monitoring-plugins.org\n" -"POT-Creation-Date: 2021-04-10 16:17+0200\n" +"POT-Creation-Date: 2022-10-19 14:57+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,227 +18,237 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: plugins/check_by_ssh.c:86 plugins/check_cluster.c:76 plugins/check_dig.c:91 -#: plugins/check_disk.c:204 plugins/check_dns.c:104 plugins/check_dummy.c:52 -#: plugins/check_fping.c:93 plugins/check_game.c:82 plugins/check_hpjd.c:105 -#: plugins/check_http.c:171 plugins/check_ldap.c:118 plugins/check_load.c:126 +#: plugins/check_by_ssh.c:88 plugins/check_cluster.c:76 plugins/check_dig.c:91 +#: plugins/check_disk.c:201 plugins/check_dns.c:106 plugins/check_dummy.c:52 +#: plugins/check_fping.c:95 plugins/check_game.c:82 plugins/check_hpjd.c:105 +#: plugins/check_http.c:173 plugins/check_ldap.c:118 plugins/check_load.c:128 #: plugins/check_mrtgtraf.c:83 plugins/check_mysql.c:124 #: plugins/check_nagios.c:91 plugins/check_nt.c:127 plugins/check_ntp.c:780 #: plugins/check_ntp_peer.c:575 plugins/check_ntp_time.c:557 #: plugins/check_nwstat.c:173 plugins/check_overcr.c:102 -#: plugins/check_pgsql.c:173 plugins/check_ping.c:95 plugins/check_procs.c:172 -#: plugins/check_radius.c:172 plugins/check_real.c:80 plugins/check_smtp.c:141 -#: plugins/check_snmp.c:242 plugins/check_ssh.c:74 plugins/check_swap.c:111 +#: plugins/check_pgsql.c:175 plugins/check_ping.c:97 plugins/check_procs.c:172 +#: plugins/check_radius.c:172 plugins/check_real.c:80 plugins/check_smtp.c:143 +#: plugins/check_snmp.c:243 plugins/check_ssh.c:74 plugins/check_swap.c:118 #: plugins/check_tcp.c:222 plugins/check_time.c:78 plugins/check_ups.c:122 #: plugins/check_users.c:84 plugins/negate.c:210 plugins-root/check_dhcp.c:270 msgid "Could not parse arguments" msgstr "" -#: plugins/check_by_ssh.c:90 plugins/check_dig.c:85 plugins/check_dns.c:97 -#: plugins/check_nagios.c:95 plugins/check_pgsql.c:179 plugins/check_ping.c:99 -#: plugins/check_procs.c:188 plugins/check_snmp.c:342 plugins/negate.c:78 +#: plugins/check_by_ssh.c:92 plugins/check_dig.c:85 plugins/check_dns.c:99 +#: plugins/check_nagios.c:95 plugins/check_pgsql.c:181 plugins/check_ping.c:101 +#: plugins/check_procs.c:188 plugins/check_snmp.c:343 plugins/negate.c:78 msgid "Cannot catch SIGALRM" msgstr "" -#: plugins/check_by_ssh.c:117 +#: plugins/check_by_ssh.c:107 +#, c-format +msgid "SSH connection failed: %s\n" +msgstr "" + +#: plugins/check_by_ssh.c:126 #, c-format msgid "Remote command execution failed: %s\n" msgstr "" -#: plugins/check_by_ssh.c:129 +#: plugins/check_by_ssh.c:141 #, c-format msgid "%s - check_by_ssh: Remote command '%s' returned status %d\n" msgstr "" -#: plugins/check_by_ssh.c:141 +#: plugins/check_by_ssh.c:153 #, c-format msgid "SSH WARNING: could not open %s\n" msgstr "" -#: plugins/check_by_ssh.c:150 +#: plugins/check_by_ssh.c:162 #, c-format msgid "%s: Error parsing output\n" msgstr "" -#: plugins/check_by_ssh.c:228 plugins/check_disk.c:519 -#: plugins/check_http.c:283 plugins/check_ldap.c:334 plugins/check_pgsql.c:312 -#: plugins/check_procs.c:437 plugins/check_radius.c:319 -#: plugins/check_real.c:357 plugins/check_smtp.c:586 plugins/check_snmp.c:764 -#: plugins/check_ssh.c:140 plugins/check_tcp.c:519 plugins/check_time.c:302 -#: plugins/check_ups.c:556 plugins/negate.c:160 +#: plugins/check_by_ssh.c:242 plugins/check_disk.c:521 plugins/check_http.c:289 +#: plugins/check_ldap.c:334 plugins/check_pgsql.c:315 plugins/check_procs.c:437 +#: plugins/check_radius.c:319 plugins/check_real.c:357 plugins/check_smtp.c:591 +#: plugins/check_snmp.c:779 plugins/check_ssh.c:140 plugins/check_tcp.c:519 +#: plugins/check_time.c:302 plugins/check_ups.c:559 plugins/negate.c:160 msgid "Timeout interval must be a positive integer" msgstr "" -#: plugins/check_by_ssh.c:238 plugins/check_pgsql.c:342 -#: plugins/check_radius.c:283 plugins/check_real.c:328 -#: plugins/check_smtp.c:511 plugins/check_tcp.c:525 plugins/check_time.c:296 -#: plugins/check_ups.c:518 +#: plugins/check_by_ssh.c:254 plugins/check_pgsql.c:345 +#: plugins/check_radius.c:283 plugins/check_real.c:328 plugins/check_smtp.c:516 +#: plugins/check_tcp.c:525 plugins/check_time.c:296 plugins/check_ups.c:521 msgid "Port must be a positive integer" msgstr "" -#: plugins/check_by_ssh.c:299 +#: plugins/check_by_ssh.c:315 msgid "skip-stdout argument must be an integer" msgstr "" -#: plugins/check_by_ssh.c:307 +#: plugins/check_by_ssh.c:323 msgid "skip-stderr argument must be an integer" msgstr "" -#: plugins/check_by_ssh.c:330 +#: plugins/check_by_ssh.c:349 #, c-format msgid "%s: You must provide a host name\n" msgstr "" -#: plugins/check_by_ssh.c:348 +#: plugins/check_by_ssh.c:366 msgid "No remotecmd" msgstr "" -#: plugins/check_by_ssh.c:362 +#: plugins/check_by_ssh.c:380 #, c-format msgid "%s: Argument limit of %d exceeded\n" msgstr "" -#: plugins/check_by_ssh.c:365 +#: plugins/check_by_ssh.c:383 msgid "Can not (re)allocate 'commargv' buffer\n" msgstr "" -#: plugins/check_by_ssh.c:379 +#: plugins/check_by_ssh.c:397 #, c-format msgid "" "%s: In passive mode, you must provide a service name for each command.\n" msgstr "" -#: plugins/check_by_ssh.c:382 +#: plugins/check_by_ssh.c:400 #, c-format msgid "" "%s: In passive mode, you must provide the host short name from the " "monitoring configs.\n" msgstr "" -#: plugins/check_by_ssh.c:396 +#: plugins/check_by_ssh.c:414 #, c-format msgid "This plugin uses SSH to execute commands on a remote host" msgstr "" -#: plugins/check_by_ssh.c:411 +#: plugins/check_by_ssh.c:429 msgid "tell ssh to use Protocol 1 [optional]" msgstr "" -#: plugins/check_by_ssh.c:413 +#: plugins/check_by_ssh.c:431 msgid "tell ssh to use Protocol 2 [optional]" msgstr "" -#: plugins/check_by_ssh.c:415 +#: plugins/check_by_ssh.c:433 msgid "Ignore all or (if specified) first n lines on STDOUT [optional]" msgstr "" -#: plugins/check_by_ssh.c:417 +#: plugins/check_by_ssh.c:435 msgid "Ignore all or (if specified) first n lines on STDERR [optional]" msgstr "" -#: plugins/check_by_ssh.c:419 +#: plugins/check_by_ssh.c:437 +msgid "Exit with an warning, if there is an output on STDERR" +msgstr "" + +#: plugins/check_by_ssh.c:439 msgid "" "tells ssh to fork rather than create a tty [optional]. This will always " "return OK if ssh is executed" msgstr "" -#: plugins/check_by_ssh.c:421 +#: plugins/check_by_ssh.c:441 msgid "command to execute on the remote machine" msgstr "" -#: plugins/check_by_ssh.c:423 +#: plugins/check_by_ssh.c:443 msgid "SSH user name on remote host [optional]" msgstr "" -#: plugins/check_by_ssh.c:425 +#: plugins/check_by_ssh.c:445 msgid "identity of an authorized key [optional]" msgstr "" -#: plugins/check_by_ssh.c:427 +#: plugins/check_by_ssh.c:447 msgid "external command file for monitoring [optional]" msgstr "" -#: plugins/check_by_ssh.c:429 +#: plugins/check_by_ssh.c:449 msgid "list of monitoring service names, separated by ':' [optional]" msgstr "" -#: plugins/check_by_ssh.c:431 +#: plugins/check_by_ssh.c:451 msgid "short name of host in the monitoring configuration [optional]" msgstr "" -#: plugins/check_by_ssh.c:433 +#: plugins/check_by_ssh.c:453 msgid "Call ssh with '-o OPTION' (may be used multiple times) [optional]" msgstr "" -#: plugins/check_by_ssh.c:435 +#: plugins/check_by_ssh.c:455 msgid "Tell ssh to use this configfile [optional]" msgstr "" -#: plugins/check_by_ssh.c:437 +#: plugins/check_by_ssh.c:457 msgid "Tell ssh to suppress warning and diagnostic messages [optional]" msgstr "" -#: plugins/check_by_ssh.c:442 +#: plugins/check_by_ssh.c:461 +msgid "Make connection problems return UNKNOWN instead of CRITICAL" +msgstr "" + +#: plugins/check_by_ssh.c:464 msgid "The most common mode of use is to refer to a local identity file with" msgstr "" -#: plugins/check_by_ssh.c:443 +#: plugins/check_by_ssh.c:465 msgid "the '-i' option. In this mode, the identity pair should have a null" msgstr "" -#: plugins/check_by_ssh.c:444 +#: plugins/check_by_ssh.c:466 msgid "passphrase and the public key should be listed in the authorized_keys" msgstr "" -#: plugins/check_by_ssh.c:445 +#: plugins/check_by_ssh.c:467 msgid "file of the remote host. Usually the key will be restricted to running" msgstr "" -#: plugins/check_by_ssh.c:446 +#: plugins/check_by_ssh.c:468 msgid "only one command on the remote server. If the remote SSH server tracks" msgstr "" -#: plugins/check_by_ssh.c:447 +#: plugins/check_by_ssh.c:469 msgid "invocation arguments, the one remote program may be an agent that can" msgstr "" -#: plugins/check_by_ssh.c:448 +#: plugins/check_by_ssh.c:470 msgid "execute additional commands as proxy" msgstr "" -#: plugins/check_by_ssh.c:450 +#: plugins/check_by_ssh.c:472 msgid "To use passive mode, provide multiple '-C' options, and provide" msgstr "" -#: plugins/check_by_ssh.c:451 +#: plugins/check_by_ssh.c:473 msgid "" "all of -O, -s, and -n options (servicelist order must match '-C'options)" msgstr "" -#: plugins/check_by_ssh.c:453 plugins/check_cluster.c:271 -#: plugins/check_dig.c:364 plugins/check_disk.c:973 plugins/check_http.c:1688 +#: plugins/check_by_ssh.c:475 plugins/check_cluster.c:271 +#: plugins/check_dig.c:364 plugins/check_disk.c:936 plugins/check_http.c:1728 #: plugins/check_nagios.c:312 plugins/check_ntp.c:879 #: plugins/check_ntp_peer.c:733 plugins/check_ntp_time.c:642 #: plugins/check_procs.c:763 plugins/negate.c:249 plugins/urlize.c:179 msgid "Examples:" msgstr "" -#: plugins/check_by_ssh.c:468 plugins/check_cluster.c:284 -#: plugins/check_dig.c:376 plugins/check_disk.c:990 plugins/check_dns.c:588 -#: plugins/check_dummy.c:122 plugins/check_fping.c:505 -#: plugins/check_game.c:331 plugins/check_hpjd.c:438 plugins/check_http.c:1726 -#: plugins/check_ldap.c:508 plugins/check_load.c:348 plugins/check_mrtg.c:382 -#: plugins/check_mysql.c:584 plugins/check_nagios.c:323 plugins/check_nt.c:797 -#: plugins/check_ntp.c:898 plugins/check_ntp_peer.c:753 -#: plugins/check_ntp_time.c:651 plugins/check_nwstat.c:1685 -#: plugins/check_overcr.c:467 plugins/check_pgsql.c:579 -#: plugins/check_ping.c:610 plugins/check_procs.c:786 -#: plugins/check_radius.c:396 plugins/check_real.c:452 -#: plugins/check_smtp.c:850 plugins/check_snmp.c:1255 plugins/check_ssh.c:325 -#: plugins/check_swap.c:571 plugins/check_tcp.c:710 plugins/check_time.c:371 -#: plugins/check_ups.c:660 plugins/check_users.c:262 -#: plugins/check_ide_smart.c:606 plugins/negate.c:273 plugins/urlize.c:196 -#: plugins-root/check_dhcp.c:1394 plugins-root/check_icmp.c:1615 +#: plugins/check_by_ssh.c:490 plugins/check_cluster.c:284 +#: plugins/check_dig.c:376 plugins/check_disk.c:953 plugins/check_dns.c:617 +#: plugins/check_dummy.c:122 plugins/check_fping.c:524 plugins/check_game.c:331 +#: plugins/check_hpjd.c:439 plugins/check_http.c:1766 plugins/check_ldap.c:511 +#: plugins/check_load.c:372 plugins/check_mrtg.c:382 plugins/check_mysql.c:584 +#: plugins/check_nagios.c:323 plugins/check_nt.c:797 plugins/check_ntp.c:898 +#: plugins/check_ntp_peer.c:753 plugins/check_ntp_time.c:651 +#: plugins/check_nwstat.c:1685 plugins/check_overcr.c:467 +#: plugins/check_pgsql.c:588 plugins/check_ping.c:617 plugins/check_procs.c:786 +#: plugins/check_radius.c:396 plugins/check_real.c:452 plugins/check_smtp.c:860 +#: plugins/check_snmp.c:1284 plugins/check_ssh.c:325 plugins/check_swap.c:610 +#: plugins/check_tcp.c:710 plugins/check_time.c:371 plugins/check_ups.c:663 +#: plugins/check_users.c:262 plugins/check_ide_smart.c:606 plugins/negate.c:273 +#: plugins/urlize.c:196 plugins-root/check_dhcp.c:1394 +#: plugins-root/check_icmp.c:1630 msgid "Usage:" msgstr "" @@ -284,14 +294,14 @@ msgid "commas" msgstr "" #: plugins/check_cluster.c:267 plugins/check_game.c:318 -#: plugins/check_http.c:1670 plugins/check_ldap.c:494 plugins/check_mrtg.c:363 +#: plugins/check_http.c:1710 plugins/check_ldap.c:497 plugins/check_mrtg.c:363 #: plugins/check_mrtgtraf.c:361 plugins/check_mysql.c:573 #: plugins/check_nt.c:781 plugins/check_ntp.c:875 plugins/check_ntp_peer.c:724 #: plugins/check_ntp_time.c:633 plugins/check_nwstat.c:1670 -#: plugins/check_overcr.c:456 plugins/check_snmp.c:1226 -#: plugins/check_swap.c:559 plugins/check_ups.c:642 +#: plugins/check_overcr.c:456 plugins/check_snmp.c:1255 +#: plugins/check_swap.c:599 plugins/check_ups.c:645 #: plugins/check_ide_smart.c:580 plugins/negate.c:255 -#: plugins-root/check_icmp.c:1590 +#: plugins-root/check_icmp.c:1605 msgid "Notes:" msgstr "" @@ -300,7 +310,7 @@ msgid "" "Will alert critical if there are 3 or more service data points in a non-OK" msgstr "" -#: plugins/check_cluster.c:274 plugins/check_ups.c:639 +#: plugins/check_cluster.c:274 plugins/check_ups.c:642 msgid "state." msgstr "" @@ -379,442 +389,455 @@ msgstr "" msgid "Pass STRING as argument(s) to dig" msgstr "" -#: plugins/check_disk.c:226 +#: plugins/check_disk.c:223 #, c-format msgid "DISK %s: %s not found\n" msgstr "" -#: plugins/check_disk.c:226 plugins/check_disk.c:1005 plugins/check_dns.c:279 +#: plugins/check_disk.c:223 plugins/check_disk.c:968 plugins/check_dns.c:295 #: plugins/check_dummy.c:74 plugins/check_mysql.c:310 #: plugins/check_nagios.c:104 plugins/check_nagios.c:168 -#: plugins/check_nagios.c:172 plugins/check_pgsql.c:602 -#: plugins/check_pgsql.c:619 plugins/check_pgsql.c:628 -#: plugins/check_pgsql.c:643 plugins/check_procs.c:351 +#: plugins/check_nagios.c:172 plugins/check_pgsql.c:611 +#: plugins/check_pgsql.c:628 plugins/check_pgsql.c:637 +#: plugins/check_pgsql.c:652 plugins/check_procs.c:351 #, c-format msgid "CRITICAL" msgstr "" -#: plugins/check_disk.c:593 +#: plugins/check_disk.c:598 #, c-format msgid "unit type %s not known\n" msgstr "" -#: plugins/check_disk.c:596 +#: plugins/check_disk.c:601 #, c-format msgid "failed allocating storage for '%s'\n" msgstr "" -#: plugins/check_disk.c:624 plugins/check_disk.c:665 plugins/check_disk.c:673 -#: plugins/check_disk.c:680 plugins/check_disk.c:684 plugins/check_disk.c:724 -#: plugins/check_disk.c:730 plugins/check_disk.c:749 plugins/check_dummy.c:77 -#: plugins/check_dummy.c:80 plugins/check_pgsql.c:644 -#: plugins/check_procs.c:506 +#: plugins/check_disk.c:629 plugins/check_disk.c:670 plugins/check_disk.c:678 +#: plugins/check_disk.c:686 plugins/check_disk.c:690 plugins/check_disk.c:732 +#: plugins/check_disk.c:738 plugins/check_disk.c:757 plugins/check_dummy.c:77 +#: plugins/check_dummy.c:80 plugins/check_pgsql.c:653 plugins/check_procs.c:506 #, c-format msgid "UNKNOWN" msgstr "" -#: plugins/check_disk.c:624 +#: plugins/check_disk.c:629 msgid "Must set a threshold value before using -p\n" msgstr "" -#: plugins/check_disk.c:665 +#: plugins/check_disk.c:670 msgid "Must set -E before selecting paths\n" msgstr "" -#: plugins/check_disk.c:673 +#: plugins/check_disk.c:678 msgid "Must set group value before selecting paths\n" msgstr "" -#: plugins/check_disk.c:680 +#: plugins/check_disk.c:686 msgid "" "Paths need to be selected before using -i/-I. Use -A to select all paths " "explicitly" msgstr "" -#: plugins/check_disk.c:684 plugins/check_disk.c:730 plugins/check_procs.c:506 +#: plugins/check_disk.c:690 plugins/check_disk.c:738 plugins/check_procs.c:506 msgid "Could not compile regular expression" msgstr "" -#: plugins/check_disk.c:724 +#: plugins/check_disk.c:732 msgid "Must set a threshold value before using -r/-R\n" msgstr "" -#: plugins/check_disk.c:750 +#: plugins/check_disk.c:758 msgid "Regular expression did not match any path or disk" msgstr "" -#: plugins/check_disk.c:796 +#: plugins/check_disk.c:804 msgid "Unknown argument" msgstr "" -#: plugins/check_disk.c:830 +#: plugins/check_disk.c:838 #, c-format msgid " for %s\n" msgstr "" -#: plugins/check_disk.c:904 +#: plugins/check_disk.c:867 msgid "" "This plugin checks the amount of used disk space on a mounted file system" msgstr "" -#: plugins/check_disk.c:905 +#: plugins/check_disk.c:868 msgid "" "and generates an alert if free space is less than one of the threshold values" msgstr "" -#: plugins/check_disk.c:915 +#: plugins/check_disk.c:878 msgid "Exit with WARNING status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:917 +#: plugins/check_disk.c:880 msgid "Exit with WARNING status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:919 +#: plugins/check_disk.c:882 msgid "Exit with CRITICAL status if less than INTEGER units of disk are free" msgstr "" -#: plugins/check_disk.c:921 +#: plugins/check_disk.c:884 msgid "Exit with CRITICAL status if less than PERCENT of disk space is free" msgstr "" -#: plugins/check_disk.c:923 +#: plugins/check_disk.c:886 msgid "Exit with WARNING status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:925 +#: plugins/check_disk.c:888 msgid "Exit with CRITICAL status if less than PERCENT of inode space is free" msgstr "" -#: plugins/check_disk.c:927 +#: plugins/check_disk.c:890 msgid "" "Mount point or block device as emitted by the mount(8) command (may be " "repeated)" msgstr "" -#: plugins/check_disk.c:929 +#: plugins/check_disk.c:892 msgid "Ignore device (only works if -p unspecified)" msgstr "" -#: plugins/check_disk.c:931 +#: plugins/check_disk.c:894 msgid "Clear thresholds" msgstr "" -#: plugins/check_disk.c:933 +#: plugins/check_disk.c:896 msgid "For paths or partitions specified with -p, only check for exact paths" msgstr "" -#: plugins/check_disk.c:935 +#: plugins/check_disk.c:898 msgid "Display only devices/mountpoints with errors" msgstr "" -#: plugins/check_disk.c:937 +#: plugins/check_disk.c:900 msgid "Don't account root-reserved blocks into freespace in perfdata" msgstr "" -#: plugins/check_disk.c:939 +#: plugins/check_disk.c:902 msgid "Display inode usage in perfdata" msgstr "" -#: plugins/check_disk.c:941 +#: plugins/check_disk.c:904 msgid "" "Group paths. Thresholds apply to (free-)space of all partitions together" msgstr "" -#: plugins/check_disk.c:943 +#: plugins/check_disk.c:906 msgid "Same as '--units kB'" msgstr "" -#: plugins/check_disk.c:945 +#: plugins/check_disk.c:908 msgid "Only check local filesystems" msgstr "" -#: plugins/check_disk.c:947 +#: plugins/check_disk.c:910 msgid "" "Only check local filesystems against thresholds. Yet call stat on remote " "filesystems" msgstr "" -#: plugins/check_disk.c:948 +#: plugins/check_disk.c:911 msgid "to test if they are accessible (e.g. to detect Stale NFS Handles)" msgstr "" -#: plugins/check_disk.c:950 -msgid "Display the mountpoint instead of the partition" +#: plugins/check_disk.c:913 +msgid "Display the (block) device instead of the mount point" msgstr "" -#: plugins/check_disk.c:952 +#: plugins/check_disk.c:915 msgid "Same as '--units MB'" msgstr "" -#: plugins/check_disk.c:954 +#: plugins/check_disk.c:917 msgid "Explicitly select all paths. This is equivalent to -R '.*'" msgstr "" -#: plugins/check_disk.c:956 +#: plugins/check_disk.c:919 msgid "" "Case insensitive regular expression for path/partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:958 +#: plugins/check_disk.c:921 msgid "Regular expression for path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:960 +#: plugins/check_disk.c:923 msgid "" "Regular expression to ignore selected path/partition (case insensitive) (may " "be repeated)" msgstr "" -#: plugins/check_disk.c:962 +#: plugins/check_disk.c:925 msgid "" "Regular expression to ignore selected path or partition (may be repeated)" msgstr "" -#: plugins/check_disk.c:965 +#: plugins/check_disk.c:928 msgid "Choose bytes, kB, MB, GB, TB (default: MB)" msgstr "" -#: plugins/check_disk.c:968 +#: plugins/check_disk.c:931 msgid "Ignore all filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:970 +#: plugins/check_disk.c:933 msgid "Check only filesystems of indicated type (may be repeated)" msgstr "" -#: plugins/check_disk.c:975 +#: plugins/check_disk.c:938 msgid "Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB" msgstr "" -#: plugins/check_disk.c:977 +#: plugins/check_disk.c:940 msgid "" "Checks all filesystems not matching -r at 100M and 50M. The fs matching the -" "r regex" msgstr "" -#: plugins/check_disk.c:978 +#: plugins/check_disk.c:941 msgid "" "are grouped which means the freespace thresholds are applied to all disks " "together" msgstr "" -#: plugins/check_disk.c:980 +#: plugins/check_disk.c:943 msgid "" "Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use " "100M/50M" msgstr "" -#: plugins/check_disk.c:1006 +#: plugins/check_disk.c:969 #, c-format msgid "%s %s: %s\n" msgstr "" -#: plugins/check_disk.c:1006 +#: plugins/check_disk.c:969 msgid "is not accessible" msgstr "" -#: plugins/check_dns.c:118 +#: plugins/check_dns.c:120 msgid "nslookup returned an error status" msgstr "" -#: plugins/check_dns.c:136 +#: plugins/check_dns.c:138 msgid "Warning plugin error" msgstr "" -#: plugins/check_dns.c:154 +#: plugins/check_dns.c:156 #, c-format msgid "DNS CRITICAL - '%s' returned empty server string\n" msgstr "" -#: plugins/check_dns.c:159 +#: plugins/check_dns.c:161 #, c-format msgid "DNS CRITICAL - No response from DNS %s\n" msgstr "" -#: plugins/check_dns.c:178 +#: plugins/check_dns.c:180 #, c-format msgid "DNS CRITICAL - '%s' returned empty host name string\n" msgstr "" -#: plugins/check_dns.c:184 +#: plugins/check_dns.c:186 msgid "Non-authoritative answer:" msgstr "" -#: plugins/check_dns.c:228 +#: plugins/check_dns.c:215 +#, c-format +msgid "Domain '%s' was not found by the server\n" +msgstr "" + +#: plugins/check_dns.c:234 #, c-format msgid "DNS CRITICAL - '%s' msg parsing exited with no address\n" msgstr "" -#: plugins/check_dns.c:259 +#: plugins/check_dns.c:265 #, c-format msgid "expected '%s' but got '%s'" msgstr "" -#: plugins/check_dns.c:266 +#: plugins/check_dns.c:272 +#, c-format +msgid "Domain '%s' was found by the server: '%s'\n" +msgstr "" + +#: plugins/check_dns.c:282 #, c-format msgid "server %s is not authoritative for %s" msgstr "" -#: plugins/check_dns.c:275 plugins/check_dummy.c:68 plugins/check_nagios.c:182 -#: plugins/check_pgsql.c:639 plugins/check_procs.c:344 +#: plugins/check_dns.c:291 plugins/check_dummy.c:68 plugins/check_nagios.c:182 +#: plugins/check_pgsql.c:648 plugins/check_procs.c:344 #, c-format msgid "OK" msgstr "" -#: plugins/check_dns.c:277 plugins/check_dummy.c:71 plugins/check_mysql.c:307 -#: plugins/check_nagios.c:182 plugins/check_pgsql.c:608 -#: plugins/check_pgsql.c:613 plugins/check_pgsql.c:641 +#: plugins/check_dns.c:293 plugins/check_dummy.c:71 plugins/check_mysql.c:307 +#: plugins/check_nagios.c:182 plugins/check_pgsql.c:617 +#: plugins/check_pgsql.c:622 plugins/check_pgsql.c:650 #: plugins/check_procs.c:346 #, c-format msgid "WARNING" msgstr "" -#: plugins/check_dns.c:281 +#: plugins/check_dns.c:297 #, c-format msgid "%.3f second response time" msgid_plural "%.3f seconds response time" msgstr[0] "" msgstr[1] "" -#: plugins/check_dns.c:282 +#: plugins/check_dns.c:298 #, c-format msgid ". %s returns %s" msgstr "" -#: plugins/check_dns.c:302 +#: plugins/check_dns.c:318 #, c-format msgid "DNS WARNING - %s\n" msgstr "" -#: plugins/check_dns.c:303 plugins/check_dns.c:306 plugins/check_dns.c:309 +#: plugins/check_dns.c:319 plugins/check_dns.c:322 plugins/check_dns.c:325 msgid " Probably a non-existent host/domain" msgstr "" -#: plugins/check_dns.c:305 +#: plugins/check_dns.c:321 #, c-format msgid "DNS CRITICAL - %s\n" msgstr "" -#: plugins/check_dns.c:308 +#: plugins/check_dns.c:324 #, c-format msgid "DNS UNKNOWN - %s\n" msgstr "" -#: plugins/check_dns.c:346 +#: plugins/check_dns.c:368 msgid "Note: nslookup is deprecated and may be removed from future releases." msgstr "" -#: plugins/check_dns.c:347 +#: plugins/check_dns.c:369 msgid "Consider using the `dig' or `host' programs instead. Run nslookup with" msgstr "" -#: plugins/check_dns.c:348 +#: plugins/check_dns.c:370 msgid "the `-sil[ent]' option to prevent this message from appearing." msgstr "" -#: plugins/check_dns.c:353 plugins/check_dns.c:355 +#: plugins/check_dns.c:375 plugins/check_dns.c:377 #, c-format msgid "No response from DNS %s\n" msgstr "" -#: plugins/check_dns.c:359 +#: plugins/check_dns.c:381 #, c-format msgid "DNS %s has no records\n" msgstr "" -#: plugins/check_dns.c:367 +#: plugins/check_dns.c:389 #, c-format msgid "Connection to DNS %s was refused\n" msgstr "" -#: plugins/check_dns.c:371 +#: plugins/check_dns.c:393 #, c-format msgid "Query was refused by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:375 +#: plugins/check_dns.c:397 #, c-format msgid "No information returned by DNS server at %s\n" msgstr "" -#: plugins/check_dns.c:382 -#, c-format -msgid "Domain %s was not found by the server\n" -msgstr "" - -#: plugins/check_dns.c:386 +#: plugins/check_dns.c:401 msgid "Network is unreachable\n" msgstr "" -#: plugins/check_dns.c:390 +#: plugins/check_dns.c:405 #, c-format msgid "DNS failure for %s\n" msgstr "" -#: plugins/check_dns.c:455 plugins/check_dns.c:463 plugins/check_dns.c:470 -#: plugins/check_dns.c:475 plugins/check_dns.c:514 plugins/check_dns.c:522 +#: plugins/check_dns.c:471 plugins/check_dns.c:479 plugins/check_dns.c:486 +#: plugins/check_dns.c:491 plugins/check_dns.c:533 plugins/check_dns.c:541 #: plugins/check_game.c:211 plugins/check_game.c:219 msgid "Input buffer overflow\n" msgstr "" -#: plugins/check_dns.c:550 +#: plugins/check_dns.c:576 msgid "" "This plugin uses the nslookup program to obtain the IP address for the given " "host/domain query." msgstr "" -#: plugins/check_dns.c:551 +#: plugins/check_dns.c:577 msgid "An optional DNS server to use may be specified." msgstr "" -#: plugins/check_dns.c:552 +#: plugins/check_dns.c:578 msgid "" "If no DNS server is specified, the default server(s) specified in /etc/" "resolv.conf will be used." msgstr "" -#: plugins/check_dns.c:562 +#: plugins/check_dns.c:588 msgid "The name or address you want to query" msgstr "" -#: plugins/check_dns.c:564 +#: plugins/check_dns.c:590 msgid "Optional DNS server you want to use for the lookup" msgstr "" -#: plugins/check_dns.c:566 +#: plugins/check_dns.c:592 msgid "" "Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end" msgstr "" -#: plugins/check_dns.c:567 +#: plugins/check_dns.c:593 msgid "" "with a dot (.). This option can be repeated multiple times (Returns OK if any" msgstr "" -#: plugins/check_dns.c:568 +#: plugins/check_dns.c:594 msgid "value matches)." msgstr "" -#: plugins/check_dns.c:570 +#: plugins/check_dns.c:596 +msgid "" +"Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)" +msgstr "" + +#: plugins/check_dns.c:597 +msgid "Cannot be used together with -a" +msgstr "" + +#: plugins/check_dns.c:599 msgid "Optionally expect the DNS server to be authoritative for the lookup" msgstr "" -#: plugins/check_dns.c:572 +#: plugins/check_dns.c:601 msgid "Return warning if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:574 +#: plugins/check_dns.c:603 msgid "Return critical if elapsed time exceeds value. Default off" msgstr "" -#: plugins/check_dns.c:576 +#: plugins/check_dns.c:605 msgid "" "Return critical if the list of expected addresses does not match all " "addresses" msgstr "" -#: plugins/check_dns.c:577 +#: plugins/check_dns.c:606 msgid "returned. Default off" msgstr "" @@ -836,174 +859,182 @@ msgstr "" msgid "of the argument with optional text" msgstr "" -#: plugins/check_fping.c:125 plugins/check_hpjd.c:130 plugins/check_ping.c:438 -#: plugins/check_swap.c:176 plugins/check_users.c:130 plugins/urlize.c:109 +#: plugins/check_fping.c:127 plugins/check_hpjd.c:134 plugins/check_ping.c:444 +#: plugins/check_swap.c:196 plugins/check_users.c:130 plugins/urlize.c:109 #, c-format msgid "Could not open pipe: %s\n" msgstr "" -#: plugins/check_fping.c:131 plugins/check_hpjd.c:136 plugins/check_load.c:157 -#: plugins/check_swap.c:182 plugins/check_users.c:136 plugins/urlize.c:115 +#: plugins/check_fping.c:133 plugins/check_hpjd.c:140 plugins/check_load.c:159 +#: plugins/check_swap.c:202 plugins/check_users.c:136 plugins/urlize.c:115 #, c-format msgid "Could not open stderr for %s\n" msgstr "" -#: plugins/check_fping.c:157 +#: plugins/check_fping.c:161 msgid "FPING UNKNOWN - IP address not found\n" msgstr "" -#: plugins/check_fping.c:160 +#: plugins/check_fping.c:164 msgid "FPING UNKNOWN - invalid commandline argument\n" msgstr "" -#: plugins/check_fping.c:163 +#: plugins/check_fping.c:167 msgid "FPING UNKNOWN - failed system call\n" msgstr "" -#: plugins/check_fping.c:187 +#: plugins/check_fping.c:194 +#, c-format +msgid "FPING %s - %s (rta=%f ms)|%s\n" +msgstr "" + +#: plugins/check_fping.c:202 #, c-format msgid "FPING UNKNOWN - %s not found\n" msgstr "" -#: plugins/check_fping.c:191 +#: plugins/check_fping.c:206 #, c-format msgid "FPING CRITICAL - %s is unreachable\n" msgstr "" -#: plugins/check_fping.c:196 +#: plugins/check_fping.c:211 #, c-format msgid "FPING UNKNOWN - %s parameter error\n" msgstr "" -#: plugins/check_fping.c:200 plugins/check_fping.c:240 +#: plugins/check_fping.c:215 plugins/check_fping.c:255 #, c-format msgid "FPING CRITICAL - %s is down\n" msgstr "" -#: plugins/check_fping.c:227 +#: plugins/check_fping.c:242 #, c-format msgid "FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n" msgstr "" -#: plugins/check_fping.c:253 +#: plugins/check_fping.c:268 #, c-format msgid "FPING %s - %s (loss=%.0f%% )|%s\n" msgstr "" -#: plugins/check_fping.c:326 plugins/check_fping.c:332 -#: plugins/check_hpjd.c:341 plugins/check_hpjd.c:372 plugins/check_mysql.c:386 -#: plugins/check_mysql.c:473 plugins/check_ntp.c:719 -#: plugins/check_ntp_peer.c:497 plugins/check_ntp_time.c:498 -#: plugins/check_pgsql.c:336 plugins/check_ping.c:295 plugins/check_ping.c:418 -#: plugins/check_radius.c:275 plugins/check_real.c:315 -#: plugins/check_real.c:377 plugins/check_smtp.c:504 plugins/check_smtp.c:646 -#: plugins/check_ssh.c:162 plugins/check_time.c:240 plugins/check_time.c:315 -#: plugins/check_ups.c:504 plugins/check_ups.c:573 +#: plugins/check_fping.c:345 plugins/check_fping.c:351 plugins/check_hpjd.c:345 +#: plugins/check_hpjd.c:376 plugins/check_mysql.c:386 plugins/check_mysql.c:473 +#: plugins/check_ntp.c:719 plugins/check_ntp_peer.c:497 +#: plugins/check_ntp_time.c:498 plugins/check_pgsql.c:339 +#: plugins/check_ping.c:301 plugins/check_ping.c:424 plugins/check_radius.c:275 +#: plugins/check_real.c:315 plugins/check_real.c:377 plugins/check_smtp.c:509 +#: plugins/check_smtp.c:654 plugins/check_ssh.c:162 plugins/check_time.c:240 +#: plugins/check_time.c:315 plugins/check_ups.c:507 plugins/check_ups.c:576 msgid "Invalid hostname/address" msgstr "" -#: plugins/check_fping.c:345 plugins/check_ldap.c:400 plugins/check_ping.c:246 -#: plugins-root/check_icmp.c:480 +#: plugins/check_fping.c:364 plugins/check_ldap.c:400 plugins/check_ping.c:252 +#: plugins-root/check_icmp.c:469 msgid "IPv6 support not available\n" msgstr "" -#: plugins/check_fping.c:378 +#: plugins/check_fping.c:397 msgid "Packet size must be a positive integer" msgstr "" -#: plugins/check_fping.c:384 +#: plugins/check_fping.c:403 msgid "Packet count must be a positive integer" msgstr "" -#: plugins/check_fping.c:390 +#: plugins/check_fping.c:409 msgid "Target timeout must be a positive integer" msgstr "" -#: plugins/check_fping.c:396 +#: plugins/check_fping.c:415 msgid "Interval must be a positive integer" msgstr "" -#: plugins/check_fping.c:402 plugins/check_ntp.c:743 +#: plugins/check_fping.c:421 plugins/check_ntp.c:743 #: plugins/check_ntp_peer.c:524 plugins/check_ntp_time.c:528 #: plugins/check_radius.c:325 plugins/check_time.c:319 msgid "Hostname was not supplied" msgstr "" -#: plugins/check_fping.c:422 +#: plugins/check_fping.c:441 #, c-format msgid "%s: Only one threshold may be packet loss (%s)\n" msgstr "" -#: plugins/check_fping.c:426 +#: plugins/check_fping.c:445 #, c-format msgid "%s: Only one threshold must be packet loss (%s)\n" msgstr "" -#: plugins/check_fping.c:458 +#: plugins/check_fping.c:475 msgid "" "This plugin will use the fping command to ping the specified host for a fast " "check" msgstr "" -#: plugins/check_fping.c:460 +#: plugins/check_fping.c:477 msgid "Note that it is necessary to set the suid flag on fping." msgstr "" -#: plugins/check_fping.c:472 +#: plugins/check_fping.c:489 msgid "" "name or IP Address of host to ping (IP Address bypasses name lookup, " "reducing system load)" msgstr "" -#: plugins/check_fping.c:474 plugins/check_ping.c:582 +#: plugins/check_fping.c:491 plugins/check_ping.c:589 msgid "warning threshold pair" msgstr "" -#: plugins/check_fping.c:476 plugins/check_ping.c:584 +#: plugins/check_fping.c:493 plugins/check_ping.c:591 msgid "critical threshold pair" msgstr "" -#: plugins/check_fping.c:478 +#: plugins/check_fping.c:495 +msgid "Return OK after first successfull reply" +msgstr "" + +#: plugins/check_fping.c:497 msgid "size of ICMP packet" msgstr "" -#: plugins/check_fping.c:480 +#: plugins/check_fping.c:499 msgid "number of ICMP packets to send" msgstr "" -#: plugins/check_fping.c:482 +#: plugins/check_fping.c:501 msgid "Target timeout (ms)" msgstr "" -#: plugins/check_fping.c:484 +#: plugins/check_fping.c:503 msgid "Interval (ms) between sending packets" msgstr "" -#: plugins/check_fping.c:486 +#: plugins/check_fping.c:505 msgid "name or IP Address of sourceip" msgstr "" -#: plugins/check_fping.c:488 +#: plugins/check_fping.c:507 msgid "source interface name" msgstr "" -#: plugins/check_fping.c:491 +#: plugins/check_fping.c:510 #, c-format msgid "" "THRESHOLD is ,%% where is the round trip average travel time " "(ms)" msgstr "" -#: plugins/check_fping.c:492 +#: plugins/check_fping.c:511 msgid "" "which triggers a WARNING or CRITICAL state, and is the percentage of" msgstr "" -#: plugins/check_fping.c:493 +#: plugins/check_fping.c:512 msgid "packet loss to trigger an alarm state." msgstr "" -#: plugins/check_fping.c:496 +#: plugins/check_fping.c:515 msgid "IPv4 is used by default. Specify -6 to use IPv6." msgstr "" @@ -1060,649 +1091,669 @@ msgid "" msgstr "" #: plugins/check_game.c:321 -msgid "" -"http://www.activesw.com/people/steve/qstat.html before you can use this " -"plugin." +msgid "https://github.com/multiplay/qstat before you can use this plugin." msgstr "" -#: plugins/check_hpjd.c:241 +#: plugins/check_hpjd.c:245 msgid "Paper Jam" msgstr "" -#: plugins/check_hpjd.c:246 +#: plugins/check_hpjd.c:250 msgid "Out of Paper" msgstr "" -#: plugins/check_hpjd.c:251 +#: plugins/check_hpjd.c:255 msgid "Printer Offline" msgstr "" -#: plugins/check_hpjd.c:256 +#: plugins/check_hpjd.c:260 msgid "Peripheral Error" msgstr "" -#: plugins/check_hpjd.c:260 +#: plugins/check_hpjd.c:264 msgid "Intervention Required" msgstr "" -#: plugins/check_hpjd.c:264 +#: plugins/check_hpjd.c:268 msgid "Toner Low" msgstr "" -#: plugins/check_hpjd.c:268 +#: plugins/check_hpjd.c:272 msgid "Insufficient Memory" msgstr "" -#: plugins/check_hpjd.c:272 +#: plugins/check_hpjd.c:276 msgid "A Door is Open" msgstr "" -#: plugins/check_hpjd.c:276 +#: plugins/check_hpjd.c:280 msgid "Output Tray is Full" msgstr "" -#: plugins/check_hpjd.c:280 +#: plugins/check_hpjd.c:284 msgid "Data too Slow for Engine" msgstr "" -#: plugins/check_hpjd.c:284 +#: plugins/check_hpjd.c:288 msgid "Unknown Paper Error" msgstr "" -#: plugins/check_hpjd.c:289 +#: plugins/check_hpjd.c:293 #, c-format msgid "Printer ok - (%s)\n" msgstr "" -#: plugins/check_hpjd.c:349 +#: plugins/check_hpjd.c:353 msgid "Port must be a positive short integer" msgstr "" -#: plugins/check_hpjd.c:409 +#: plugins/check_hpjd.c:410 msgid "This plugin tests the STATUS of an HP printer with a JetDirect card." msgstr "" -#: plugins/check_hpjd.c:410 +#: plugins/check_hpjd.c:411 msgid "Net-snmp must be installed on the computer running the plugin." msgstr "" -#: plugins/check_hpjd.c:420 +#: plugins/check_hpjd.c:421 msgid "The SNMP community name " msgstr "" -#: plugins/check_hpjd.c:421 plugins/check_hpjd.c:425 +#: plugins/check_hpjd.c:422 plugins/check_hpjd.c:426 #, c-format msgid "(default=%s)" msgstr "" -#: plugins/check_hpjd.c:424 +#: plugins/check_hpjd.c:425 msgid "Specify the port to check " msgstr "" -#: plugins/check_hpjd.c:428 +#: plugins/check_hpjd.c:429 msgid "Disable paper check " msgstr "" -#: plugins/check_http.c:193 +#: plugins/check_http.c:195 msgid "file does not exist or is not readable" msgstr "" -#: plugins/check_http.c:315 plugins/check_http.c:320 plugins/check_http.c:326 -#: plugins/check_smtp.c:600 plugins/check_tcp.c:590 plugins/check_tcp.c:595 +#: plugins/check_http.c:321 plugins/check_http.c:326 plugins/check_http.c:332 +#: plugins/check_smtp.c:605 plugins/check_tcp.c:590 plugins/check_tcp.c:595 #: plugins/check_tcp.c:601 msgid "Invalid certificate expiration period" msgstr "" -#: plugins/check_http.c:364 +#: plugins/check_http.c:375 msgid "" "Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional " "'+' suffix)" msgstr "" -#: plugins/check_http.c:370 plugins/check_tcp.c:614 plugins/check_tcp.c:623 +#: plugins/check_http.c:381 plugins/check_tcp.c:614 plugins/check_tcp.c:623 msgid "Invalid option - SSL is not available" msgstr "" -#: plugins/check_http.c:391 +#: plugins/check_http.c:389 +msgid "Invalid max_redirs count" +msgstr "" + +#: plugins/check_http.c:409 msgid "Invalid onredirect option" msgstr "" -#: plugins/check_http.c:393 +#: plugins/check_http.c:411 #, c-format msgid "option f:%d \n" msgstr "" -#: plugins/check_http.c:428 +#: plugins/check_http.c:446 msgid "Invalid port number" msgstr "" -#: plugins/check_http.c:486 +#: plugins/check_http.c:504 #, c-format msgid "Could Not Compile Regular Expression: %s" msgstr "" -#: plugins/check_http.c:500 plugins/check_ntp.c:732 +#: plugins/check_http.c:518 plugins/check_ntp.c:732 #: plugins/check_ntp_peer.c:513 plugins/check_ntp_time.c:517 -#: plugins/check_smtp.c:626 plugins/check_ssh.c:151 plugins/check_tcp.c:491 +#: plugins/check_smtp.c:634 plugins/check_ssh.c:151 plugins/check_tcp.c:491 msgid "IPv6 support not available" msgstr "" -#: plugins/check_http.c:568 plugins/check_ping.c:422 +#: plugins/check_http.c:586 plugins/check_ping.c:428 msgid "You must specify a server address or host name" msgstr "" -#: plugins/check_http.c:585 +#: plugins/check_http.c:603 msgid "" "If you use a client certificate you must also specify a private key file" msgstr "" -#: plugins/check_http.c:712 plugins/check_http.c:880 +#: plugins/check_http.c:730 plugins/check_http.c:898 msgid "HTTP UNKNOWN - Memory allocation error\n" msgstr "" -#: plugins/check_http.c:784 +#: plugins/check_http.c:802 #, c-format msgid "%sServer date unknown, " msgstr "" -#: plugins/check_http.c:787 +#: plugins/check_http.c:805 #, c-format msgid "%sDocument modification date unknown, " msgstr "" -#: plugins/check_http.c:794 +#: plugins/check_http.c:812 #, c-format msgid "%sServer date \"%100s\" unparsable, " msgstr "" -#: plugins/check_http.c:797 +#: plugins/check_http.c:815 #, c-format msgid "%sDocument date \"%100s\" unparsable, " msgstr "" -#: plugins/check_http.c:800 +#: plugins/check_http.c:818 #, c-format msgid "%sDocument is %d seconds in the future, " msgstr "" -#: plugins/check_http.c:805 +#: plugins/check_http.c:823 #, c-format msgid "%sLast modified %.1f days ago, " msgstr "" -#: plugins/check_http.c:808 +#: plugins/check_http.c:826 #, c-format msgid "%sLast modified %d:%02d:%02d ago, " msgstr "" -#: plugins/check_http.c:922 +#: plugins/check_http.c:940 msgid "HTTP CRITICAL - Unable to open TCP socket\n" msgstr "" -#: plugins/check_http.c:1106 +#: plugins/check_http.c:1126 msgid "HTTP CRITICAL - Error on receive\n" msgstr "" -#: plugins/check_http.c:1116 +#: plugins/check_http.c:1136 msgid "HTTP CRITICAL - No data received from host\n" msgstr "" -#: plugins/check_http.c:1167 +#: plugins/check_http.c:1187 #, c-format msgid "Invalid HTTP response received from host: %s\n" msgstr "" -#: plugins/check_http.c:1171 +#: plugins/check_http.c:1191 #, c-format msgid "Invalid HTTP response received from host on port %d: %s\n" msgstr "" -#: plugins/check_http.c:1174 plugins/check_http.c:1326 +#: plugins/check_http.c:1194 plugins/check_http.c:1346 #, c-format msgid "" "%s\n" "%s" msgstr "" -#: plugins/check_http.c:1182 +#: plugins/check_http.c:1202 #, c-format msgid "Status line output matched \"%s\" - " msgstr "" -#: plugins/check_http.c:1193 +#: plugins/check_http.c:1213 #, c-format msgid "HTTP CRITICAL: Invalid Status Line (%s)\n" msgstr "" -#: plugins/check_http.c:1200 +#: plugins/check_http.c:1220 #, c-format msgid "HTTP CRITICAL: Invalid Status (%s)\n" msgstr "" -#: plugins/check_http.c:1204 plugins/check_http.c:1209 -#: plugins/check_http.c:1219 plugins/check_http.c:1223 +#: plugins/check_http.c:1224 plugins/check_http.c:1229 +#: plugins/check_http.c:1239 plugins/check_http.c:1243 #, c-format msgid "%s - " msgstr "" -#: plugins/check_http.c:1242 +#: plugins/check_http.c:1262 #, c-format msgid "%sheader '%s' not found on '%s://%s:%d%s', " msgstr "" -#: plugins/check_http.c:1254 +#: plugins/check_http.c:1274 #, c-format msgid "%sstring '%s' not found on '%s://%s:%d%s', " msgstr "" -#: plugins/check_http.c:1267 +#: plugins/check_http.c:1287 #, c-format msgid "%spattern not found, " msgstr "" -#: plugins/check_http.c:1269 +#: plugins/check_http.c:1289 #, c-format msgid "%spattern found, " msgstr "" -#: plugins/check_http.c:1275 +#: plugins/check_http.c:1295 #, c-format msgid "%sExecute Error: %s, " msgstr "" -#: plugins/check_http.c:1291 +#: plugins/check_http.c:1311 #, c-format msgid "%spage size %d too large, " msgstr "" -#: plugins/check_http.c:1294 +#: plugins/check_http.c:1314 #, c-format msgid "%spage size %d too small, " msgstr "" -#: plugins/check_http.c:1307 +#: plugins/check_http.c:1327 #, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s" msgstr "" -#: plugins/check_http.c:1319 +#: plugins/check_http.c:1339 #, c-format msgid "%s - %d bytes in %.3f second response time %s|%s %s" msgstr "" -#: plugins/check_http.c:1360 +#: plugins/check_http.c:1382 msgid "HTTP UNKNOWN - Could not allocate addr\n" msgstr "" -#: plugins/check_http.c:1365 plugins/check_http.c:1396 +#: plugins/check_http.c:1387 plugins/check_http.c:1418 msgid "HTTP UNKNOWN - Could not allocate URL\n" msgstr "" -#: plugins/check_http.c:1374 +#: plugins/check_http.c:1396 #, c-format msgid "HTTP UNKNOWN - Could not find redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1389 +#: plugins/check_http.c:1411 #, c-format msgid "HTTP UNKNOWN - Empty redirect location%s\n" msgstr "" -#: plugins/check_http.c:1439 +#: plugins/check_http.c:1473 #, c-format msgid "HTTP UNKNOWN - Could not parse redirect location - %s%s\n" msgstr "" -#: plugins/check_http.c:1449 +#: plugins/check_http.c:1483 #, c-format msgid "HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1457 +#: plugins/check_http.c:1491 #, c-format -msgid "HTTP WARNING - redirection creates an infinite loop - %s://%s:%d%s%s\n" +msgid "HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1478 +#: plugins/check_http.c:1512 #, c-format msgid "HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n" msgstr "" -#: plugins/check_http.c:1486 +#: plugins/check_http.c:1520 #, c-format msgid "Redirection to %s://%s:%d%s\n" msgstr "" -#: plugins/check_http.c:1561 +#: plugins/check_http.c:1595 msgid "This plugin tests the HTTP service on the specified host. It can test" msgstr "" -#: plugins/check_http.c:1562 +#: plugins/check_http.c:1596 msgid "normal (http) and secure (https) servers, follow redirects, search for" msgstr "" -#: plugins/check_http.c:1563 +#: plugins/check_http.c:1597 msgid "strings and regular expressions, check connection times, and report on" msgstr "" -#: plugins/check_http.c:1564 +#: plugins/check_http.c:1598 msgid "certificate expiration times." msgstr "" -#: plugins/check_http.c:1571 +#: plugins/check_http.c:1605 #, c-format msgid "In the first form, make an HTTP request." msgstr "" -#: plugins/check_http.c:1572 +#: plugins/check_http.c:1606 #, c-format msgid "" "In the second form, connect to the server and check the TLS certificate." msgstr "" -#: plugins/check_http.c:1574 +#: plugins/check_http.c:1608 #, c-format msgid "NOTE: One or both of -H and -I must be specified" msgstr "" -#: plugins/check_http.c:1582 +#: plugins/check_http.c:1616 msgid "Host name argument for servers using host headers (virtual host)" msgstr "" -#: plugins/check_http.c:1583 +#: plugins/check_http.c:1617 msgid "Append a port to include it in the header (eg: example.com:5000)" msgstr "" -#: plugins/check_http.c:1585 +#: plugins/check_http.c:1619 msgid "" "IP address or name (use numeric address if possible to bypass DNS lookup)." msgstr "" -#: plugins/check_http.c:1587 +#: plugins/check_http.c:1621 msgid "Port number (default: " msgstr "" -#: plugins/check_http.c:1594 +#: plugins/check_http.c:1628 msgid "" "Connect via SSL. Port defaults to 443. VERSION is optional, and prevents" msgstr "" -#: plugins/check_http.c:1595 +#: plugins/check_http.c:1629 msgid "auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1," msgstr "" -#: plugins/check_http.c:1596 +#: plugins/check_http.c:1630 msgid "1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted." msgstr "" -#: plugins/check_http.c:1598 +#: plugins/check_http.c:1632 msgid "Enable SSL/TLS hostname extension support (SNI)" msgstr "" -#: plugins/check_http.c:1600 +#: plugins/check_http.c:1634 msgid "" "Minimum number of days a certificate has to be valid. Port defaults to 443" msgstr "" -#: plugins/check_http.c:1601 -msgid "(when this option is used the URL is not checked.)" +#: plugins/check_http.c:1635 +msgid "" +"(when this option is used the URL is not checked by default. You can use" msgstr "" -#: plugins/check_http.c:1603 +#: plugins/check_http.c:1636 +msgid " --continue-after-certificate to override this behavior)" +msgstr "" + +#: plugins/check_http.c:1638 +msgid "" +"Allows the HTTP check to continue after performing the certificate check." +msgstr "" + +#: plugins/check_http.c:1639 +msgid "Does nothing unless -C is used." +msgstr "" + +#: plugins/check_http.c:1641 msgid "Name of file that contains the client certificate (PEM format)" msgstr "" -#: plugins/check_http.c:1604 +#: plugins/check_http.c:1642 msgid "to be used in establishing the SSL session" msgstr "" -#: plugins/check_http.c:1606 +#: plugins/check_http.c:1644 msgid "Name of file containing the private key (PEM format)" msgstr "" -#: plugins/check_http.c:1607 +#: plugins/check_http.c:1645 msgid "matching the client certificate" msgstr "" -#: plugins/check_http.c:1611 +#: plugins/check_http.c:1649 msgid "Comma-delimited list of strings, at least one of them is expected in" msgstr "" -#: plugins/check_http.c:1612 +#: plugins/check_http.c:1650 msgid "the first (status) line of the server response (default: " msgstr "" -#: plugins/check_http.c:1614 +#: plugins/check_http.c:1652 msgid "" "If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)" msgstr "" -#: plugins/check_http.c:1616 +#: plugins/check_http.c:1654 msgid "String to expect in the response headers" msgstr "" -#: plugins/check_http.c:1618 +#: plugins/check_http.c:1656 msgid "String to expect in the content" msgstr "" -#: plugins/check_http.c:1620 +#: plugins/check_http.c:1658 msgid "URL to GET or POST (default: /)" msgstr "" -#: plugins/check_http.c:1622 +#: plugins/check_http.c:1660 msgid "URL encoded http POST data" msgstr "" -#: plugins/check_http.c:1624 +#: plugins/check_http.c:1662 msgid "Set HTTP method." msgstr "" -#: plugins/check_http.c:1626 +#: plugins/check_http.c:1664 msgid "Don't wait for document body: stop reading after headers." msgstr "" -#: plugins/check_http.c:1627 +#: plugins/check_http.c:1665 msgid "(Note that this still does an HTTP GET or POST, not a HEAD.)" msgstr "" -#: plugins/check_http.c:1629 +#: plugins/check_http.c:1667 msgid "Warn if document is more than SECONDS old. the number can also be of" msgstr "" -#: plugins/check_http.c:1630 +#: plugins/check_http.c:1668 msgid "the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days." msgstr "" -#: plugins/check_http.c:1632 +#: plugins/check_http.c:1670 msgid "specify Content-Type header media type when POSTing\n" msgstr "" -#: plugins/check_http.c:1635 +#: plugins/check_http.c:1673 msgid "Allow regex to span newlines (must precede -r or -R)" msgstr "" -#: plugins/check_http.c:1637 +#: plugins/check_http.c:1675 msgid "Search page for regex STRING" msgstr "" -#: plugins/check_http.c:1639 +#: plugins/check_http.c:1677 msgid "Search page for case-insensitive regex STRING" msgstr "" -#: plugins/check_http.c:1641 +#: plugins/check_http.c:1679 msgid "Return CRITICAL if found, OK if not\n" msgstr "" -#: plugins/check_http.c:1644 +#: plugins/check_http.c:1682 msgid "Username:password on sites with basic authentication" msgstr "" -#: plugins/check_http.c:1646 +#: plugins/check_http.c:1684 msgid "Username:password on proxy-servers with basic authentication" msgstr "" -#: plugins/check_http.c:1648 +#: plugins/check_http.c:1686 msgid "String to be sent in http header as \"User Agent\"" msgstr "" -#: plugins/check_http.c:1650 +#: plugins/check_http.c:1688 msgid "" "Any other tags to be sent in http header. Use multiple times for additional " "headers" msgstr "" -#: plugins/check_http.c:1652 +#: plugins/check_http.c:1690 msgid "Print additional performance data" msgstr "" -#: plugins/check_http.c:1654 +#: plugins/check_http.c:1692 msgid "Print body content below status line" msgstr "" -#: plugins/check_http.c:1656 +#: plugins/check_http.c:1694 msgid "Wrap output in HTML link (obsoleted by urlize)" msgstr "" -#: plugins/check_http.c:1658 +#: plugins/check_http.c:1696 msgid "How to handle redirected pages. sticky is like follow but stick to the" msgstr "" -#: plugins/check_http.c:1659 +#: plugins/check_http.c:1697 msgid "specified IP address. stickyport also ensures port stays the same." msgstr "" -#: plugins/check_http.c:1661 +#: plugins/check_http.c:1699 +msgid "Maximal number of redirects (default: " +msgstr "" + +#: plugins/check_http.c:1702 msgid "Minimum page size required (bytes) : Maximum page size required (bytes)" msgstr "" -#: plugins/check_http.c:1671 +#: plugins/check_http.c:1711 msgid "This plugin will attempt to open an HTTP connection with the host." msgstr "" -#: plugins/check_http.c:1672 +#: plugins/check_http.c:1712 msgid "" "Successful connects return STATE_OK, refusals and timeouts return " "STATE_CRITICAL" msgstr "" -#: plugins/check_http.c:1673 +#: plugins/check_http.c:1713 msgid "" "other errors return STATE_UNKNOWN. Successful connects, but incorrect " "response" msgstr "" -#: plugins/check_http.c:1674 +#: plugins/check_http.c:1714 msgid "" "messages from the host result in STATE_WARNING return values. If you are" msgstr "" -#: plugins/check_http.c:1675 +#: plugins/check_http.c:1715 msgid "" "checking a virtual server that uses 'host headers' you must supply the FQDN" msgstr "" -#: plugins/check_http.c:1676 +#: plugins/check_http.c:1716 msgid "(fully qualified domain name) as the [host_name] argument." msgstr "" -#: plugins/check_http.c:1680 +#: plugins/check_http.c:1720 msgid "This plugin can also check whether an SSL enabled web server is able to" msgstr "" -#: plugins/check_http.c:1681 +#: plugins/check_http.c:1721 msgid "serve content (optionally within a specified time) or whether the X509 " msgstr "" -#: plugins/check_http.c:1682 +#: plugins/check_http.c:1722 msgid "certificate is still valid for the specified number of days." msgstr "" -#: plugins/check_http.c:1684 +#: plugins/check_http.c:1724 msgid "Please note that this plugin does not check if the presented server" msgstr "" -#: plugins/check_http.c:1685 +#: plugins/check_http.c:1725 msgid "certificate matches the hostname of the server, or if the certificate" msgstr "" -#: plugins/check_http.c:1686 +#: plugins/check_http.c:1726 msgid "has a valid chain of trust to one of the locally installed CAs." msgstr "" -#: plugins/check_http.c:1690 +#: plugins/check_http.c:1730 msgid "" "When the 'www.verisign.com' server returns its content within 5 seconds," msgstr "" -#: plugins/check_http.c:1691 plugins/check_http.c:1710 +#: plugins/check_http.c:1731 plugins/check_http.c:1750 msgid "" "a STATE_OK will be returned. When the server returns its content but exceeds" msgstr "" -#: plugins/check_http.c:1692 plugins/check_http.c:1711 +#: plugins/check_http.c:1732 plugins/check_http.c:1751 msgid "" "the 5-second threshold, a STATE_WARNING will be returned. When an error " "occurs," msgstr "" -#: plugins/check_http.c:1693 +#: plugins/check_http.c:1733 msgid "a STATE_CRITICAL will be returned." msgstr "" -#: plugins/check_http.c:1696 +#: plugins/check_http.c:1736 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 14 days," msgstr "" -#: plugins/check_http.c:1697 plugins/check_http.c:1703 +#: plugins/check_http.c:1737 plugins/check_http.c:1743 msgid "" "a STATE_OK is returned. When the certificate is still valid, but for less " "than" msgstr "" -#: plugins/check_http.c:1698 +#: plugins/check_http.c:1738 msgid "" "14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when" msgstr "" -#: plugins/check_http.c:1699 +#: plugins/check_http.c:1739 msgid "the certificate is expired." msgstr "" -#: plugins/check_http.c:1702 +#: plugins/check_http.c:1742 msgid "" "When the certificate of 'www.verisign.com' is valid for more than 30 days," msgstr "" -#: plugins/check_http.c:1704 +#: plugins/check_http.c:1744 msgid "30 days, but more than 14 days, a STATE_WARNING is returned." msgstr "" -#: plugins/check_http.c:1705 +#: plugins/check_http.c:1745 msgid "" "A STATE_CRITICAL will be returned when certificate expires in less than 14 " "days" msgstr "" -#: plugins/check_http.c:1708 +#: plugins/check_http.c:1748 msgid "" "check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j " "CONNECT -H www.verisign.com " msgstr "" -#: plugins/check_http.c:1709 +#: plugins/check_http.c:1749 msgid "" -"all these options are needed: -I -p -u -S" -"(sl) -j CONNECT -H " +"all these options are needed: -I -p -u -" +"S(sl) -j CONNECT -H " msgstr "" -#: plugins/check_http.c:1712 +#: plugins/check_http.c:1752 msgid "" "a STATE_CRITICAL will be returned. By adding a colon to the method you can " "set the method used" msgstr "" -#: plugins/check_http.c:1713 +#: plugins/check_http.c:1753 msgid "inside the proxied connection: -j CONNECT:POST" msgstr "" @@ -1769,165 +1820,167 @@ msgstr "" msgid "Please specify the LDAP base\n" msgstr "" -#: plugins/check_ldap.c:462 +#: plugins/check_ldap.c:465 msgid "ldap attribute to search (default: \"(objectclass=*)\"" msgstr "" -#: plugins/check_ldap.c:464 +#: plugins/check_ldap.c:467 msgid "ldap base (eg. ou=my unit, o=my org, c=at" msgstr "" -#: plugins/check_ldap.c:466 +#: plugins/check_ldap.c:469 msgid "ldap bind DN (if required)" msgstr "" -#: plugins/check_ldap.c:468 -msgid "ldap password (if required)" +#: plugins/check_ldap.c:471 +msgid "" +"ldap password (if required, or set the password through environment variable " +"'LDAP_PASSWORD')" msgstr "" -#: plugins/check_ldap.c:470 +#: plugins/check_ldap.c:473 msgid "use starttls mechanism introduced in protocol version 3" msgstr "" -#: plugins/check_ldap.c:472 +#: plugins/check_ldap.c:475 msgid "use ldaps (ldap v2 ssl method). this also sets the default port to" msgstr "" -#: plugins/check_ldap.c:476 +#: plugins/check_ldap.c:479 msgid "use ldap protocol version 2" msgstr "" -#: plugins/check_ldap.c:478 +#: plugins/check_ldap.c:481 msgid "use ldap protocol version 3" msgstr "" -#: plugins/check_ldap.c:479 +#: plugins/check_ldap.c:482 msgid "default protocol version:" msgstr "" -#: plugins/check_ldap.c:485 +#: plugins/check_ldap.c:488 msgid "Number of found entries to result in warning status" msgstr "" -#: plugins/check_ldap.c:487 +#: plugins/check_ldap.c:490 msgid "Number of found entries to result in critical status" msgstr "" -#: plugins/check_ldap.c:495 +#: plugins/check_ldap.c:498 msgid "If this plugin is called via 'check_ldaps', method 'STARTTLS' will be" msgstr "" -#: plugins/check_ldap.c:496 +#: plugins/check_ldap.c:499 #, c-format msgid "" " implied (using default port %i) unless --port=636 is specified. In that " "case\n" msgstr "" -#: plugins/check_ldap.c:497 +#: plugins/check_ldap.c:500 msgid "'SSL on connect' will be used no matter how the plugin was called." msgstr "" -#: plugins/check_ldap.c:498 +#: plugins/check_ldap.c:501 msgid "" "This detection is deprecated, please use 'check_ldap' with the '--starttls' " "or '--ssl' flags" msgstr "" -#: plugins/check_ldap.c:499 +#: plugins/check_ldap.c:502 msgid "to define the behaviour explicitly instead." msgstr "" -#: plugins/check_ldap.c:500 +#: plugins/check_ldap.c:503 msgid "The parameters --warn-entries and --crit-entries are optional." msgstr "" -#: plugins/check_load.c:91 +#: plugins/check_load.c:93 msgid "Warning threshold must be float or float triplet!\n" msgstr "" -#: plugins/check_load.c:136 plugins/check_load.c:152 +#: plugins/check_load.c:138 plugins/check_load.c:154 #, c-format msgid "Error opening %s\n" msgstr "" -#: plugins/check_load.c:167 +#: plugins/check_load.c:169 #, c-format -msgid "could not parse load from uptime %s: %s\n" +msgid "could not parse load from uptime %s: %d\n" msgstr "" -#: plugins/check_load.c:173 +#: plugins/check_load.c:175 #, c-format msgid "Error code %d returned in %s\n" msgstr "" -#: plugins/check_load.c:188 +#: plugins/check_load.c:183 #, c-format msgid "Error in getloadavg()\n" msgstr "" -#: plugins/check_load.c:191 plugins/check_load.c:193 +#: plugins/check_load.c:186 plugins/check_load.c:188 #, c-format msgid "Error processing %s\n" msgstr "" -#: plugins/check_load.c:202 +#: plugins/check_load.c:197 plugins/check_load.c:212 #, c-format msgid "load average: %.2f, %.2f, %.2f" msgstr "" -#: plugins/check_load.c:302 +#: plugins/check_load.c:327 #, c-format msgid "Critical threshold for %d-minute load average is not specified\n" msgstr "" -#: plugins/check_load.c:304 +#: plugins/check_load.c:329 #, c-format msgid "Warning threshold for %d-minute load average is not specified\n" msgstr "" -#: plugins/check_load.c:306 +#: plugins/check_load.c:331 #, c-format msgid "" "Parameter inconsistency: %d-minute \"warning load\" is greater than " "\"critical load\"\n" msgstr "" -#: plugins/check_load.c:322 +#: plugins/check_load.c:346 #, c-format msgid "This plugin tests the current system load average." msgstr "" -#: plugins/check_load.c:332 +#: plugins/check_load.c:356 msgid "Exit with WARNING status if load average exceeds WLOADn" msgstr "" -#: plugins/check_load.c:334 +#: plugins/check_load.c:358 msgid "Exit with CRITICAL status if load average exceed CLOADn" msgstr "" -#: plugins/check_load.c:335 +#: plugins/check_load.c:359 msgid "the load average format is the same used by \"uptime\" and \"w\"" msgstr "" -#: plugins/check_load.c:337 +#: plugins/check_load.c:361 msgid "Divide the load averages by the number of CPUs (when possible)" msgstr "" -#: plugins/check_load.c:339 +#: plugins/check_load.c:363 msgid "Number of processes to show when printing the top consuming processes." msgstr "" -#: plugins/check_load.c:340 +#: plugins/check_load.c:364 msgid "NUMBER_OF_PROCS=0 disables this feature. Default value is 0" msgstr "" -#: plugins/check_load.c:377 +#: plugins/check_load.c:401 #, c-format msgid "'%s' exited with non-zero status.\n" msgstr "" -#: plugins/check_load.c:381 +#: plugins/check_load.c:405 #, c-format msgid "some error occurred getting procs list.\n" msgstr "" @@ -3514,411 +3567,424 @@ msgid "" "higher than the warning threshold value, EXCEPT with the uptime variable" msgstr "" -#: plugins/check_pgsql.c:223 +#: plugins/check_pgsql.c:225 #, c-format msgid "CRITICAL - no connection to '%s' (%s).\n" msgstr "" -#: plugins/check_pgsql.c:251 +#: plugins/check_pgsql.c:253 #, c-format msgid " %s - database %s (%f sec.)|%s\n" msgstr "" -#: plugins/check_pgsql.c:318 plugins/check_time.c:277 plugins/check_time.c:289 +#: plugins/check_pgsql.c:321 plugins/check_time.c:277 plugins/check_time.c:289 #: plugins/check_users.c:228 msgid "Critical threshold must be a positive integer" msgstr "" -#: plugins/check_pgsql.c:324 plugins/check_time.c:258 plugins/check_time.c:282 +#: plugins/check_pgsql.c:327 plugins/check_time.c:258 plugins/check_time.c:282 #: plugins/check_users.c:226 msgid "Warning threshold must be a positive integer" msgstr "" -#: plugins/check_pgsql.c:348 +#: plugins/check_pgsql.c:351 msgid "Database name is not valid" msgstr "" -#: plugins/check_pgsql.c:354 +#: plugins/check_pgsql.c:357 msgid "User name is not valid" msgstr "" -#: plugins/check_pgsql.c:505 +#: plugins/check_pgsql.c:511 #, c-format msgid "Test whether a PostgreSQL Database is accepting connections." msgstr "" -#: plugins/check_pgsql.c:517 +#: plugins/check_pgsql.c:523 msgid "Database to check " msgstr "" -#: plugins/check_pgsql.c:518 +#: plugins/check_pgsql.c:524 #, c-format msgid "(default: %s)\n" msgstr "" -#: plugins/check_pgsql.c:520 +#: plugins/check_pgsql.c:526 msgid "Login name of user" msgstr "" -#: plugins/check_pgsql.c:522 +#: plugins/check_pgsql.c:528 msgid "Password (BIG SECURITY ISSUE)" msgstr "" -#: plugins/check_pgsql.c:524 +#: plugins/check_pgsql.c:530 msgid "Connection parameters (keyword = value), see below" msgstr "" -#: plugins/check_pgsql.c:531 +#: plugins/check_pgsql.c:537 msgid "SQL query to run. Only first column in first row will be read" msgstr "" -#: plugins/check_pgsql.c:533 -msgid "SQL query value to result in warning status (double)" -msgstr "" - -#: plugins/check_pgsql.c:535 -msgid "SQL query value to result in critical status (double)" +#: plugins/check_pgsql.c:539 +msgid "A name for the query, this string is used instead of the query" msgstr "" #: plugins/check_pgsql.c:540 +msgid "in the long output of the plugin" +msgstr "" + +#: plugins/check_pgsql.c:542 +msgid "SQL query value to result in warning status (double)" +msgstr "" + +#: plugins/check_pgsql.c:544 +msgid "SQL query value to result in critical status (double)" +msgstr "" + +#: plugins/check_pgsql.c:549 msgid "All parameters are optional." msgstr "" -#: plugins/check_pgsql.c:541 +#: plugins/check_pgsql.c:550 msgid "" "This plugin tests a PostgreSQL DBMS to determine whether it is active and" msgstr "" -#: plugins/check_pgsql.c:542 +#: plugins/check_pgsql.c:551 msgid "accepting queries. In its current operation, it simply connects to the" msgstr "" -#: plugins/check_pgsql.c:543 +#: plugins/check_pgsql.c:552 msgid "" "specified database, and then disconnects. If no database is specified, it" msgstr "" -#: plugins/check_pgsql.c:544 +#: plugins/check_pgsql.c:553 msgid "" "connects to the template1 database, which is present in every functioning" msgstr "" -#: plugins/check_pgsql.c:545 +#: plugins/check_pgsql.c:554 msgid "PostgreSQL DBMS." msgstr "" -#: plugins/check_pgsql.c:547 +#: plugins/check_pgsql.c:556 msgid "If a query is specified using the -q option, it will be executed after" msgstr "" -#: plugins/check_pgsql.c:548 -msgid "connecting to the server. The result from the query has to be numeric." -msgstr "" - -#: plugins/check_pgsql.c:549 -msgid "" -"Multiple SQL commands, separated by semicolon, are allowed but the result " -msgstr "" - -#: plugins/check_pgsql.c:550 -msgid "of the last command is taken into account only. The value of the first" -msgstr "" - -#: plugins/check_pgsql.c:551 -msgid "column in the first row is used as the check result." -msgstr "" - -#: plugins/check_pgsql.c:553 -msgid "" -"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" -msgstr "" - -#: plugins/check_pgsql.c:554 -msgid "" -"for details about how to access internal statistics of the database server." -msgstr "" - -#: plugins/check_pgsql.c:556 -msgid "" -"For a list of available connection parameters which may be used with the -o" -msgstr "" - #: plugins/check_pgsql.c:557 -msgid "" -"command line option, see the documentation for PQconnectdb() in the chapter" +msgid "connecting to the server. The result from the query has to be numeric." msgstr "" #: plugins/check_pgsql.c:558 msgid "" -"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +"Multiple SQL commands, separated by semicolon, are allowed but the result " msgstr "" #: plugins/check_pgsql.c:559 -msgid "" -"used to specify a service name in pg_service.conf to be used for additional" +msgid "of the last command is taken into account only. The value of the first" msgstr "" #: plugins/check_pgsql.c:560 -msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgid "column in the first row is used as the check result." msgstr "" -#: plugins/check_pgsql.c:561 -msgid "-o 'sslmode=require'." +#: plugins/check_pgsql.c:562 +msgid "" +"See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual" msgstr "" #: plugins/check_pgsql.c:563 msgid "" +"for details about how to access internal statistics of the database server." +msgstr "" + +#: plugins/check_pgsql.c:565 +msgid "" +"For a list of available connection parameters which may be used with the -o" +msgstr "" + +#: plugins/check_pgsql.c:566 +msgid "" +"command line option, see the documentation for PQconnectdb() in the chapter" +msgstr "" + +#: plugins/check_pgsql.c:567 +msgid "" +"\"libpq - C Library\" of the PostgreSQL manual. For example, this may be" +msgstr "" + +#: plugins/check_pgsql.c:568 +msgid "" +"used to specify a service name in pg_service.conf to be used for additional" +msgstr "" + +#: plugins/check_pgsql.c:569 +msgid "connection parameters: -o 'service=' or to specify the SSL mode:" +msgstr "" + +#: plugins/check_pgsql.c:570 +msgid "-o 'sslmode=require'." +msgstr "" + +#: plugins/check_pgsql.c:572 +msgid "" "The plugin will connect to a local postmaster if no host is specified. To" msgstr "" -#: plugins/check_pgsql.c:564 +#: plugins/check_pgsql.c:573 msgid "" "connect to a remote host, be sure that the remote postmaster accepts TCP/IP" msgstr "" -#: plugins/check_pgsql.c:565 +#: plugins/check_pgsql.c:574 msgid "connections (start the postmaster with the -i option)." msgstr "" -#: plugins/check_pgsql.c:567 +#: plugins/check_pgsql.c:576 msgid "" "Typically, the monitoring user (unless the --logname option is used) should " "be" msgstr "" -#: plugins/check_pgsql.c:568 +#: plugins/check_pgsql.c:577 msgid "" "able to connect to the database without a password. The plugin can also send" msgstr "" -#: plugins/check_pgsql.c:569 +#: plugins/check_pgsql.c:578 msgid "a password, but no effort is made to obscure or encrypt the password." msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 #, c-format msgid "QUERY %s - %s: %s.\n" msgstr "" -#: plugins/check_pgsql.c:602 +#: plugins/check_pgsql.c:611 msgid "Error with query" msgstr "" -#: plugins/check_pgsql.c:608 +#: plugins/check_pgsql.c:617 msgid "No rows returned" msgstr "" -#: plugins/check_pgsql.c:613 +#: plugins/check_pgsql.c:622 msgid "No columns returned" msgstr "" -#: plugins/check_pgsql.c:619 +#: plugins/check_pgsql.c:628 msgid "No data returned" msgstr "" -#: plugins/check_pgsql.c:628 +#: plugins/check_pgsql.c:637 msgid "Is not a numeric" msgstr "" -#: plugins/check_pgsql.c:645 +#: plugins/check_pgsql.c:655 +#, c-format +msgid "%s returned %f" +msgstr "" + +#: plugins/check_pgsql.c:658 #, c-format msgid "'%s' returned %f" msgstr "" -#: plugins/check_ping.c:141 +#: plugins/check_ping.c:143 msgid "CRITICAL - Could not interpret output from ping command\n" msgstr "" -#: plugins/check_ping.c:157 +#: plugins/check_ping.c:159 #, c-format msgid "PING %s - %sPacket loss = %d%%" msgstr "" -#: plugins/check_ping.c:160 +#: plugins/check_ping.c:162 #, c-format msgid "PING %s - %sPacket loss = %d%%, RTA = %2.2f ms" msgstr "" -#: plugins/check_ping.c:257 +#: plugins/check_ping.c:263 msgid "Could not realloc() addresses\n" msgstr "" -#: plugins/check_ping.c:272 plugins/check_ping.c:352 +#: plugins/check_ping.c:278 plugins/check_ping.c:358 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:306 +#: plugins/check_ping.c:312 #, c-format msgid " (%s) must be an integer percentage\n" msgstr "" -#: plugins/check_ping.c:317 +#: plugins/check_ping.c:323 #, c-format msgid " (%s) must be an integer percentage\n" msgstr "" -#: plugins/check_ping.c:328 +#: plugins/check_ping.c:334 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:339 +#: plugins/check_ping.c:345 #, c-format msgid " (%s) must be a non-negative number\n" msgstr "" -#: plugins/check_ping.c:372 +#: plugins/check_ping.c:378 #, c-format msgid "" "%s: Warning threshold must be integer or percentage!\n" "\n" msgstr "" -#: plugins/check_ping.c:385 +#: plugins/check_ping.c:391 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:389 +#: plugins/check_ping.c:395 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:393 +#: plugins/check_ping.c:399 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:397 +#: plugins/check_ping.c:403 #, c-format msgid " was not set\n" msgstr "" -#: plugins/check_ping.c:401 +#: plugins/check_ping.c:407 #, c-format msgid " (%f) cannot be larger than (%f)\n" msgstr "" -#: plugins/check_ping.c:405 +#: plugins/check_ping.c:411 #, c-format msgid " (%d) cannot be larger than (%d)\n" msgstr "" -#: plugins/check_ping.c:442 +#: plugins/check_ping.c:448 #, c-format msgid "Cannot open stderr for %s\n" msgstr "" -#: plugins/check_ping.c:499 plugins/check_ping.c:501 +#: plugins/check_ping.c:505 plugins/check_ping.c:507 msgid "System call sent warnings to stderr " msgstr "" -#: plugins/check_ping.c:526 +#: plugins/check_ping.c:533 #, c-format msgid "CRITICAL - Network Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:528 +#: plugins/check_ping.c:535 #, c-format msgid "CRITICAL - Host Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:530 +#: plugins/check_ping.c:537 #, c-format msgid "CRITICAL - Bogus ICMP: Port Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:532 +#: plugins/check_ping.c:539 #, c-format msgid "CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:534 +#: plugins/check_ping.c:541 #, c-format msgid "CRITICAL - Network Prohibited (%s)\n" msgstr "" -#: plugins/check_ping.c:536 +#: plugins/check_ping.c:543 #, c-format msgid "CRITICAL - Host Prohibited (%s)\n" msgstr "" -#: plugins/check_ping.c:538 +#: plugins/check_ping.c:545 #, c-format msgid "CRITICAL - Packet Filtered (%s)\n" msgstr "" -#: plugins/check_ping.c:540 +#: plugins/check_ping.c:547 #, c-format msgid "CRITICAL - Host not found (%s)\n" msgstr "" -#: plugins/check_ping.c:542 +#: plugins/check_ping.c:549 #, c-format msgid "CRITICAL - Time to live exceeded (%s)\n" msgstr "" -#: plugins/check_ping.c:544 +#: plugins/check_ping.c:551 #, c-format msgid "CRITICAL - Destination Unreachable (%s)\n" msgstr "" -#: plugins/check_ping.c:551 +#: plugins/check_ping.c:558 msgid "Unable to realloc warn_text\n" msgstr "" -#: plugins/check_ping.c:568 +#: plugins/check_ping.c:575 #, c-format msgid "Use ping to check connection statistics for a remote host." msgstr "" -#: plugins/check_ping.c:580 +#: plugins/check_ping.c:587 msgid "host to ping" msgstr "" -#: plugins/check_ping.c:586 +#: plugins/check_ping.c:593 msgid "number of ICMP ECHO packets to send" msgstr "" -#: plugins/check_ping.c:587 +#: plugins/check_ping.c:594 #, c-format msgid "(Default: %d)\n" msgstr "" -#: plugins/check_ping.c:589 +#: plugins/check_ping.c:596 msgid "show HTML in the plugin output (obsoleted by urlize)" msgstr "" -#: plugins/check_ping.c:594 +#: plugins/check_ping.c:601 msgid "THRESHOLD is ,% where is the round trip average travel" msgstr "" -#: plugins/check_ping.c:595 +#: plugins/check_ping.c:602 msgid "time (ms) which triggers a WARNING or CRITICAL state, and is the" msgstr "" -#: plugins/check_ping.c:596 +#: plugins/check_ping.c:603 msgid "percentage of packet loss to trigger an alarm state." msgstr "" -#: plugins/check_ping.c:599 +#: plugins/check_ping.c:606 msgid "" "This plugin uses the ping command to probe the specified host for packet loss" msgstr "" -#: plugins/check_ping.c:600 +#: plugins/check_ping.c:607 msgid "" "(percentage) and round trip average (milliseconds). It can produce HTML " "output" msgstr "" -#: plugins/check_ping.c:601 +#: plugins/check_ping.c:608 msgid "" "linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in" msgstr "" -#: plugins/check_ping.c:602 +#: plugins/check_ping.c:609 msgid "the contrib area of the downloads section at http://www.nagios.org/" msgstr "" @@ -4153,8 +4219,7 @@ msgid "Alert if VSZ of any processes over 50K or 100K" msgstr "" #: plugins/check_procs.c:778 -#, c-format -msgid "Alert if CPU of any processes over 10%% or 20%%" +msgid "Alert if CPU of any processes over 10% or 20%" msgstr "" #: plugins/check_radius.c:177 @@ -4169,7 +4234,7 @@ msgstr "" msgid "Invalid NAS-Identifier\n" msgstr "" -#: plugins/check_radius.c:195 plugins/check_smtp.c:151 +#: plugins/check_radius.c:195 plugins/check_smtp.c:153 #, c-format msgid "gethostname() failed!\n" msgstr "" @@ -4322,11 +4387,11 @@ msgstr "" msgid "REAL %s - %d second response time\n" msgstr "" -#: plugins/check_real.c:337 plugins/check_ups.c:536 +#: plugins/check_real.c:337 plugins/check_ups.c:539 msgid "Warning time must be a positive integer" msgstr "" -#: plugins/check_real.c:346 plugins/check_ups.c:527 +#: plugins/check_real.c:346 plugins/check_ups.c:530 msgid "Critical time must be a positive integer" msgstr "" @@ -4351,7 +4416,7 @@ msgstr "" msgid "This plugin will attempt to open an RTSP connection with the host." msgstr "" -#: plugins/check_real.c:439 plugins/check_smtp.c:837 +#: plugins/check_real.c:439 plugins/check_smtp.c:847 msgid "Successul connects return STATE_OK, refusals and timeouts return" msgstr "" @@ -4369,512 +4434,549 @@ msgstr "" msgid "values." msgstr "" -#: plugins/check_smtp.c:147 plugins/check_swap.c:266 plugins/check_swap.c:272 +#: plugins/check_smtp.c:149 plugins/check_swap.c:286 plugins/check_swap.c:292 #, c-format msgid "malloc() failed!\n" msgstr "" -#: plugins/check_smtp.c:186 plugins/check_smtp.c:198 +#: plugins/check_smtp.c:190 plugins/check_smtp.c:202 #, c-format msgid "recv() failed\n" msgstr "" -#: plugins/check_smtp.c:208 +#: plugins/check_smtp.c:212 #, c-format msgid "WARNING - TLS not supported by server\n" msgstr "" -#: plugins/check_smtp.c:220 +#: plugins/check_smtp.c:224 #, c-format msgid "Server does not support STARTTLS\n" msgstr "" -#: plugins/check_smtp.c:226 +#: plugins/check_smtp.c:230 #, c-format msgid "CRITICAL - Cannot create SSL context.\n" msgstr "" -#: plugins/check_smtp.c:246 +#: plugins/check_smtp.c:250 msgid "SMTP UNKNOWN - Cannot send EHLO command via TLS." msgstr "" -#: plugins/check_smtp.c:251 +#: plugins/check_smtp.c:255 #, c-format msgid "sent %s" msgstr "" -#: plugins/check_smtp.c:253 +#: plugins/check_smtp.c:257 msgid "SMTP UNKNOWN - Cannot read EHLO response via TLS." msgstr "" -#: plugins/check_smtp.c:283 +#: plugins/check_smtp.c:287 #, c-format msgid "Invalid SMTP response received from host: %s\n" msgstr "" -#: plugins/check_smtp.c:285 +#: plugins/check_smtp.c:289 #, c-format msgid "Invalid SMTP response received from host on port %d: %s\n" msgstr "" -#: plugins/check_smtp.c:308 plugins/check_snmp.c:834 +#: plugins/check_smtp.c:312 plugins/check_snmp.c:855 #, c-format msgid "Could Not Compile Regular Expression" msgstr "" -#: plugins/check_smtp.c:317 +#: plugins/check_smtp.c:321 #, c-format msgid "SMTP %s - Invalid response '%s' to command '%s'\n" msgstr "" -#: plugins/check_smtp.c:321 plugins/check_snmp.c:520 +#: plugins/check_smtp.c:325 plugins/check_snmp.c:532 #, c-format msgid "Execute Error: %s\n" msgstr "" -#: plugins/check_smtp.c:335 +#: plugins/check_smtp.c:339 msgid "no authuser specified, " msgstr "" -#: plugins/check_smtp.c:340 +#: plugins/check_smtp.c:344 msgid "no authpass specified, " msgstr "" -#: plugins/check_smtp.c:347 plugins/check_smtp.c:368 plugins/check_smtp.c:388 -#: plugins/check_smtp.c:693 +#: plugins/check_smtp.c:351 plugins/check_smtp.c:372 plugins/check_smtp.c:392 +#: plugins/check_smtp.c:701 #, c-format msgid "sent %s\n" msgstr "" -#: plugins/check_smtp.c:350 +#: plugins/check_smtp.c:354 msgid "recv() failed after AUTH LOGIN, " msgstr "" -#: plugins/check_smtp.c:355 plugins/check_smtp.c:376 plugins/check_smtp.c:396 -#: plugins/check_smtp.c:704 +#: plugins/check_smtp.c:359 plugins/check_smtp.c:380 plugins/check_smtp.c:400 +#: plugins/check_smtp.c:712 #, c-format msgid "received %s\n" msgstr "" -#: plugins/check_smtp.c:359 +#: plugins/check_smtp.c:363 msgid "invalid response received after AUTH LOGIN, " msgstr "" -#: plugins/check_smtp.c:372 +#: plugins/check_smtp.c:376 msgid "recv() failed after sending authuser, " msgstr "" -#: plugins/check_smtp.c:380 +#: plugins/check_smtp.c:384 msgid "invalid response received after authuser, " msgstr "" -#: plugins/check_smtp.c:392 +#: plugins/check_smtp.c:396 msgid "recv() failed after sending authpass, " msgstr "" -#: plugins/check_smtp.c:400 +#: plugins/check_smtp.c:404 msgid "invalid response received after authpass, " msgstr "" -#: plugins/check_smtp.c:407 +#: plugins/check_smtp.c:411 msgid "only authtype LOGIN is supported, " msgstr "" -#: plugins/check_smtp.c:431 +#: plugins/check_smtp.c:435 #, c-format msgid "SMTP %s - %s%.3f sec. response time%s%s|%s\n" msgstr "" -#: plugins/check_smtp.c:541 plugins/check_smtp.c:553 +#: plugins/check_smtp.c:546 plugins/check_smtp.c:558 #, c-format msgid "Could not realloc() units [%d]\n" msgstr "" -#: plugins/check_smtp.c:561 +#: plugins/check_smtp.c:566 msgid "Critical time must be a positive" msgstr "" -#: plugins/check_smtp.c:569 +#: plugins/check_smtp.c:574 msgid "Warning time must be a positive" msgstr "" -#: plugins/check_smtp.c:612 +#: plugins/check_smtp.c:617 msgid "SSL support not available - install OpenSSL and recompile" msgstr "" -#: plugins/check_smtp.c:684 plugins/check_smtp.c:689 +#: plugins/check_smtp.c:692 plugins/check_smtp.c:697 #, c-format msgid "Connection closed by server before sending QUIT command\n" msgstr "" -#: plugins/check_smtp.c:699 +#: plugins/check_smtp.c:707 #, c-format msgid "recv() failed after QUIT." msgstr "" -#: plugins/check_smtp.c:701 +#: plugins/check_smtp.c:709 #, c-format msgid "Connection reset by peer." msgstr "" -#: plugins/check_smtp.c:791 +#: plugins/check_smtp.c:799 msgid "This plugin will attempt to open an SMTP connection with the host." msgstr "" -#: plugins/check_smtp.c:805 +#: plugins/check_smtp.c:813 #, c-format msgid " String to expect in first line of server response (default: '%s')\n" msgstr "" -#: plugins/check_smtp.c:807 +#: plugins/check_smtp.c:815 msgid "SMTP command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:809 +#: plugins/check_smtp.c:817 msgid "Expected response to command (may be used repeatedly)" msgstr "" -#: plugins/check_smtp.c:811 +#: plugins/check_smtp.c:819 msgid "FROM-address to include in MAIL command, required by Exchange 2000" msgstr "" -#: plugins/check_smtp.c:813 +#: plugins/check_smtp.c:821 msgid "FQDN used for HELO" msgstr "" -#: plugins/check_smtp.c:816 plugins/check_tcp.c:689 +#: plugins/check_smtp.c:824 plugins/check_tcp.c:689 msgid "Minimum number of days a certificate has to be valid." msgstr "" -#: plugins/check_smtp.c:818 +#: plugins/check_smtp.c:826 msgid "Use STARTTLS for the connection." msgstr "" -#: plugins/check_smtp.c:822 +#: plugins/check_smtp.c:830 msgid "SMTP AUTH type to check (default none, only LOGIN supported)" msgstr "" -#: plugins/check_smtp.c:824 +#: plugins/check_smtp.c:832 msgid "SMTP AUTH username" msgstr "" -#: plugins/check_smtp.c:826 +#: plugins/check_smtp.c:834 msgid "SMTP AUTH password" msgstr "" -#: plugins/check_smtp.c:828 -msgid "Ignore failure when sending QUIT command to server" +#: plugins/check_smtp.c:836 +msgid "Send LHLO instead of HELO/EHLO" msgstr "" #: plugins/check_smtp.c:838 +msgid "Ignore failure when sending QUIT command to server" +msgstr "" + +#: plugins/check_smtp.c:848 msgid "STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful" msgstr "" -#: plugins/check_smtp.c:839 +#: plugins/check_smtp.c:849 msgid "connects, but incorrect response messages from the host result in" msgstr "" -#: plugins/check_smtp.c:840 +#: plugins/check_smtp.c:850 msgid "STATE_WARNING return values." msgstr "" -#: plugins/check_snmp.c:171 plugins/check_snmp.c:604 +#: plugins/check_snmp.c:172 plugins/check_snmp.c:618 msgid "Cannot malloc" msgstr "" -#: plugins/check_snmp.c:362 +#: plugins/check_snmp.c:363 #, c-format msgid "External command error: %s\n" msgstr "" -#: plugins/check_snmp.c:367 +#: plugins/check_snmp.c:368 #, c-format msgid "External command error with no output (return code: %d)\n" msgstr "" -#: plugins/check_snmp.c:473 +#: plugins/check_snmp.c:478 plugins/check_snmp.c:480 plugins/check_snmp.c:482 +#: plugins/check_snmp.c:484 #, c-format msgid "No valid data returned (%s)\n" msgstr "" -#: plugins/check_snmp.c:484 +#: plugins/check_snmp.c:496 msgid "Time duration between plugin calls is invalid" msgstr "" -#: plugins/check_snmp.c:610 +#: plugins/check_snmp.c:624 msgid "Cannot asprintf()" msgstr "" -#: plugins/check_snmp.c:616 +#: plugins/check_snmp.c:630 msgid "Cannot realloc()" msgstr "" -#: plugins/check_snmp.c:632 +#: plugins/check_snmp.c:646 msgid "No previous data to calculate rate - assume okay" msgstr "" -#: plugins/check_snmp.c:779 +#: plugins/check_snmp.c:794 msgid "Retries interval must be a positive integer" msgstr "" -#: plugins/check_snmp.c:859 +#: plugins/check_snmp.c:831 +msgid "Exit status must be a positive integer" +msgstr "" + +#: plugins/check_snmp.c:880 #, c-format msgid "Could not reallocate labels[%d]" msgstr "" -#: plugins/check_snmp.c:872 +#: plugins/check_snmp.c:893 msgid "Could not reallocate labels\n" msgstr "" -#: plugins/check_snmp.c:888 +#: plugins/check_snmp.c:909 #, c-format msgid "Could not reallocate units [%d]\n" msgstr "" -#: plugins/check_snmp.c:900 +#: plugins/check_snmp.c:921 msgid "Could not realloc() units\n" msgstr "" -#: plugins/check_snmp.c:917 +#: plugins/check_snmp.c:938 msgid "Rate multiplier must be a positive integer" msgstr "" -#: plugins/check_snmp.c:982 +#: plugins/check_snmp.c:1003 msgid "No host specified\n" msgstr "" -#: plugins/check_snmp.c:986 +#: plugins/check_snmp.c:1007 msgid "No OIDs specified\n" msgstr "" -#: plugins/check_snmp.c:1009 plugins/check_snmp.c:1027 -#: plugins/check_snmp.c:1045 +#: plugins/check_snmp.c:1030 plugins/check_snmp.c:1048 +#: plugins/check_snmp.c:1066 #, c-format msgid "Required parameter: %s\n" msgstr "" -#: plugins/check_snmp.c:1020 +#: plugins/check_snmp.c:1041 msgid "Invalid seclevel" msgstr "" -#: plugins/check_snmp.c:1066 +#: plugins/check_snmp.c:1087 msgid "Invalid SNMP version" msgstr "" -#: plugins/check_snmp.c:1083 +#: plugins/check_snmp.c:1104 msgid "Unbalanced quotes\n" msgstr "" -#: plugins/check_snmp.c:1132 +#: plugins/check_snmp.c:1153 msgid "Check status of remote machines and obtain system information via SNMP" msgstr "" -#: plugins/check_snmp.c:1146 +#: plugins/check_snmp.c:1167 msgid "Use SNMP GETNEXT instead of SNMP GET" msgstr "" -#: plugins/check_snmp.c:1148 +#: plugins/check_snmp.c:1169 msgid "SNMP protocol version" msgstr "" -#: plugins/check_snmp.c:1150 +#: plugins/check_snmp.c:1171 msgid "SNMPv3 context" msgstr "" -#: plugins/check_snmp.c:1152 +#: plugins/check_snmp.c:1173 msgid "SNMPv3 securityLevel" msgstr "" -#: plugins/check_snmp.c:1154 +#: plugins/check_snmp.c:1175 msgid "SNMPv3 auth proto" msgstr "" -#: plugins/check_snmp.c:1156 +#: plugins/check_snmp.c:1177 msgid "SNMPv3 priv proto (default DES)" msgstr "" -#: plugins/check_snmp.c:1160 +#: plugins/check_snmp.c:1181 msgid "Optional community string for SNMP communication" msgstr "" -#: plugins/check_snmp.c:1161 +#: plugins/check_snmp.c:1182 msgid "default is" msgstr "" -#: plugins/check_snmp.c:1163 +#: plugins/check_snmp.c:1184 msgid "SNMPv3 username" msgstr "" -#: plugins/check_snmp.c:1165 +#: plugins/check_snmp.c:1186 msgid "SNMPv3 authentication password" msgstr "" -#: plugins/check_snmp.c:1167 +#: plugins/check_snmp.c:1188 msgid "SNMPv3 privacy password" msgstr "" -#: plugins/check_snmp.c:1171 +#: plugins/check_snmp.c:1192 msgid "Object identifier(s) or SNMP variables whose value you wish to query" msgstr "" -#: plugins/check_snmp.c:1173 +#: plugins/check_snmp.c:1194 msgid "" "List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'" msgstr "" -#: plugins/check_snmp.c:1174 +#: plugins/check_snmp.c:1195 msgid "for symbolic OIDs.)" msgstr "" -#: plugins/check_snmp.c:1176 +#: plugins/check_snmp.c:1197 msgid "Delimiter to use when parsing returned data. Default is" msgstr "" -#: plugins/check_snmp.c:1177 +#: plugins/check_snmp.c:1198 msgid "Any data on the right hand side of the delimiter is considered" msgstr "" -#: plugins/check_snmp.c:1178 +#: plugins/check_snmp.c:1199 msgid "to be the data that should be used in the evaluation." msgstr "" -#: plugins/check_snmp.c:1182 +#: plugins/check_snmp.c:1201 +msgid "If the check returns a 0 length string or NULL value" +msgstr "" + +#: plugins/check_snmp.c:1202 +msgid "This option allows you to choose what status you want it to exit" +msgstr "" + +#: plugins/check_snmp.c:1203 +msgid "Excluding this option renders the default exit of 3(STATE_UNKNOWN)" +msgstr "" + +#: plugins/check_snmp.c:1204 +msgid "0 = OK" +msgstr "" + +#: plugins/check_snmp.c:1205 +msgid "1 = WARNING" +msgstr "" + +#: plugins/check_snmp.c:1206 +msgid "2 = CRITICAL" +msgstr "" + +#: plugins/check_snmp.c:1207 +msgid "3 = UNKNOWN" +msgstr "" + +#: plugins/check_snmp.c:1211 msgid "Warning threshold range(s)" msgstr "" -#: plugins/check_snmp.c:1184 +#: plugins/check_snmp.c:1213 msgid "Critical threshold range(s)" msgstr "" -#: plugins/check_snmp.c:1186 +#: plugins/check_snmp.c:1215 msgid "Enable rate calculation. See 'Rate Calculation' below" msgstr "" -#: plugins/check_snmp.c:1188 +#: plugins/check_snmp.c:1217 msgid "" "Converts rate per second. For example, set to 60 to convert to per minute" msgstr "" -#: plugins/check_snmp.c:1190 +#: plugins/check_snmp.c:1219 msgid "Add/substract the specified OFFSET to numeric sensor data" msgstr "" -#: plugins/check_snmp.c:1194 +#: plugins/check_snmp.c:1223 msgid "Return OK state (for that OID) if STRING is an exact match" msgstr "" -#: plugins/check_snmp.c:1196 +#: plugins/check_snmp.c:1225 msgid "" "Return OK state (for that OID) if extended regular expression REGEX matches" msgstr "" -#: plugins/check_snmp.c:1198 +#: plugins/check_snmp.c:1227 msgid "" "Return OK state (for that OID) if case-insensitive extended REGEX matches" msgstr "" -#: plugins/check_snmp.c:1200 +#: plugins/check_snmp.c:1229 msgid "Invert search result (CRITICAL if found)" msgstr "" -#: plugins/check_snmp.c:1204 +#: plugins/check_snmp.c:1233 msgid "Prefix label for output from plugin" msgstr "" -#: plugins/check_snmp.c:1206 +#: plugins/check_snmp.c:1235 msgid "Units label(s) for output data (e.g., 'sec.')." msgstr "" -#: plugins/check_snmp.c:1208 +#: plugins/check_snmp.c:1237 msgid "Separates output on multiple OID requests" msgstr "" -#: plugins/check_snmp.c:1211 +#: plugins/check_snmp.c:1240 msgid "" "NOTE the final timeout value is calculated using this formula: " "timeout_interval * retries + 5" msgstr "" -#: plugins/check_snmp.c:1213 +#: plugins/check_snmp.c:1242 msgid "Number of retries to be used in the requests, default: " msgstr "" -#: plugins/check_snmp.c:1216 +#: plugins/check_snmp.c:1245 msgid "Label performance data with OIDs instead of --label's" msgstr "" -#: plugins/check_snmp.c:1221 +#: plugins/check_snmp.c:1250 msgid "" "This plugin uses the 'snmpget' command included with the NET-SNMP package." msgstr "" -#: plugins/check_snmp.c:1222 +#: plugins/check_snmp.c:1251 msgid "" "if you don't have the package installed, you will need to download it from" msgstr "" -#: plugins/check_snmp.c:1223 +#: plugins/check_snmp.c:1252 msgid "http://net-snmp.sourceforge.net before you can use this plugin." msgstr "" -#: plugins/check_snmp.c:1227 +#: plugins/check_snmp.c:1256 msgid "" "- Multiple OIDs (and labels) may be indicated by a comma or space-delimited " msgstr "" -#: plugins/check_snmp.c:1228 +#: plugins/check_snmp.c:1257 msgid "list (lists with internal spaces must be quoted)." msgstr "" -#: plugins/check_snmp.c:1232 +#: plugins/check_snmp.c:1261 msgid "" "- When checking multiple OIDs, separate ranges by commas like '-w " "1:10,1:,:20'" msgstr "" -#: plugins/check_snmp.c:1233 +#: plugins/check_snmp.c:1262 msgid "- Note that only one string and one regex may be checked at present" msgstr "" -#: plugins/check_snmp.c:1234 +#: plugins/check_snmp.c:1263 msgid "" "- All evaluation methods other than PR, STR, and SUBSTR expect that the value" msgstr "" -#: plugins/check_snmp.c:1235 +#: plugins/check_snmp.c:1264 msgid "returned from the SNMP query is an unsigned integer." msgstr "" -#: plugins/check_snmp.c:1238 +#: plugins/check_snmp.c:1267 msgid "Rate Calculation:" msgstr "" -#: plugins/check_snmp.c:1239 +#: plugins/check_snmp.c:1268 msgid "In many places, SNMP returns counters that are only meaningful when" msgstr "" -#: plugins/check_snmp.c:1240 +#: plugins/check_snmp.c:1269 msgid "calculating the counter difference since the last check. check_snmp" msgstr "" -#: plugins/check_snmp.c:1241 +#: plugins/check_snmp.c:1270 msgid "saves the last state information in a file so that the rate per second" msgstr "" -#: plugins/check_snmp.c:1242 +#: plugins/check_snmp.c:1271 msgid "can be calculated. Use the --rate option to save state information." msgstr "" -#: plugins/check_snmp.c:1243 +#: plugins/check_snmp.c:1272 msgid "" "On the first run, there will be no prior state - this will return with OK." msgstr "" -#: plugins/check_snmp.c:1244 +#: plugins/check_snmp.c:1273 msgid "The state is uniquely determined by the arguments to the plugin, so" msgstr "" -#: plugins/check_snmp.c:1245 +#: plugins/check_snmp.c:1274 msgid "changing the arguments will create a new state file." msgstr "" @@ -4916,106 +5018,110 @@ msgstr "" msgid "Alert if protocol doesn't match expected protocol version (ex: 2.0)" msgstr "" -#: plugins/check_swap.c:170 +#: plugins/check_swap.c:190 #, c-format msgid "Command: %s\n" msgstr "" -#: plugins/check_swap.c:172 +#: plugins/check_swap.c:192 #, c-format msgid "Format: %s\n" msgstr "" -#: plugins/check_swap.c:208 +#: plugins/check_swap.c:228 #, c-format msgid "total=%.0f, used=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:222 +#: plugins/check_swap.c:242 #, c-format msgid "total=%.0f, free=%.0f\n" msgstr "" -#: plugins/check_swap.c:254 +#: plugins/check_swap.c:274 msgid "Error getting swap devices\n" msgstr "" -#: plugins/check_swap.c:257 +#: plugins/check_swap.c:277 msgid "SWAP OK: No swap devices defined\n" msgstr "" -#: plugins/check_swap.c:278 plugins/check_swap.c:320 +#: plugins/check_swap.c:298 plugins/check_swap.c:340 msgid "swapctl failed: " msgstr "" -#: plugins/check_swap.c:279 plugins/check_swap.c:321 +#: plugins/check_swap.c:299 plugins/check_swap.c:341 msgid "Error in swapctl call\n" msgstr "" -#: plugins/check_swap.c:359 +#: plugins/check_swap.c:379 #, c-format -msgid "SWAP %s - %d%% free (%d MB out of %d MB) %s|" +msgid "SWAP %s - %d%% free (%dMB out of %dMB) %s|" msgstr "" -#: plugins/check_swap.c:441 -msgid "Warning threshold must be integer or percentage!" +#: plugins/check_swap.c:475 +msgid "Warning threshold percentage must be <= 100!" msgstr "" -#: plugins/check_swap.c:459 -msgid "Critical threshold must be integer or percentage!" +#: plugins/check_swap.c:485 +msgid "Warning threshold be positive integer or percentage!" msgstr "" -#: plugins/check_swap.c:466 +#: plugins/check_swap.c:505 +msgid "Critical threshold percentage must be <= 100!" +msgstr "" + +#: plugins/check_swap.c:515 +msgid "Critical threshold be positive integer or percentage!" +msgstr "" + +#: plugins/check_swap.c:524 msgid "" "no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) " "or integer (0-3)." msgstr "" -#: plugins/check_swap.c:517 -msgid "Warning percentage should be more than critical percentage" +#: plugins/check_swap.c:561 +msgid "Warning should be more than critical" msgstr "" -#: plugins/check_swap.c:521 -msgid "Warning free space should be more than critical free space" -msgstr "" - -#: plugins/check_swap.c:535 +#: plugins/check_swap.c:575 msgid "Check swap space on local machine." msgstr "" -#: plugins/check_swap.c:545 +#: plugins/check_swap.c:585 msgid "" "Exit with WARNING status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:547 +#: plugins/check_swap.c:587 msgid "Exit with WARNING status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:549 +#: plugins/check_swap.c:589 msgid "" "Exit with CRITICAL status if less than INTEGER bytes of swap space are free" msgstr "" -#: plugins/check_swap.c:551 +#: plugins/check_swap.c:591 msgid "Exit with CRITICAL status if less than PERCENT of swap space is free" msgstr "" -#: plugins/check_swap.c:553 +#: plugins/check_swap.c:593 msgid "Conduct comparisons for all swap partitions, one by one" msgstr "" -#: plugins/check_swap.c:555 +#: plugins/check_swap.c:595 msgid "" "Resulting state when there is no swap regardless of thresholds. Default:" msgstr "" -#: plugins/check_swap.c:560 +#: plugins/check_swap.c:600 msgid "" "Both INTEGER and PERCENT thresholds can be specified, they are all checked." msgstr "" -#: plugins/check_swap.c:561 +#: plugins/check_swap.c:601 msgid "On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s." msgstr "" @@ -5238,114 +5344,118 @@ msgstr "" msgid "UPS does not support any available options\n" msgstr "" -#: plugins/check_ups.c:348 plugins/check_ups.c:411 +#: plugins/check_ups.c:348 plugins/check_ups.c:414 msgid "Invalid response received from host" msgstr "" -#: plugins/check_ups.c:420 +#: plugins/check_ups.c:406 +msgid "UPS name to long for buffer" +msgstr "" + +#: plugins/check_ups.c:423 #, c-format msgid "CRITICAL - no such UPS '%s' on that host\n" msgstr "" -#: plugins/check_ups.c:430 +#: plugins/check_ups.c:433 msgid "CRITICAL - UPS data is stale" msgstr "" -#: plugins/check_ups.c:435 +#: plugins/check_ups.c:438 #, c-format msgid "Unknown error: %s\n" msgstr "" -#: plugins/check_ups.c:442 +#: plugins/check_ups.c:445 msgid "Error: unable to parse variable" msgstr "" -#: plugins/check_ups.c:549 +#: plugins/check_ups.c:552 msgid "Unrecognized UPS variable" msgstr "" -#: plugins/check_ups.c:587 +#: plugins/check_ups.c:590 msgid "Error : no UPS indicated" msgstr "" -#: plugins/check_ups.c:607 +#: plugins/check_ups.c:610 msgid "" "This plugin tests the UPS service on the specified host. Network UPS Tools" msgstr "" -#: plugins/check_ups.c:608 +#: plugins/check_ups.c:611 msgid "from www.networkupstools.org must be running for this plugin to work." msgstr "" -#: plugins/check_ups.c:620 +#: plugins/check_ups.c:623 msgid "Name of UPS" msgstr "" -#: plugins/check_ups.c:622 +#: plugins/check_ups.c:625 msgid "Output of temperatures in Celsius" msgstr "" -#: plugins/check_ups.c:624 +#: plugins/check_ups.c:627 msgid "Valid values for STRING are" msgstr "" -#: plugins/check_ups.c:635 +#: plugins/check_ups.c:638 msgid "" "This plugin attempts to determine the status of a UPS (Uninterruptible Power" msgstr "" -#: plugins/check_ups.c:636 +#: plugins/check_ups.c:639 msgid "" "Supply) on a local or remote host. If the UPS is online or calibrating, the" msgstr "" -#: plugins/check_ups.c:637 +#: plugins/check_ups.c:640 msgid "" "plugin will return an OK state. If the battery is on it will return a WARNING" msgstr "" -#: plugins/check_ups.c:638 +#: plugins/check_ups.c:641 msgid "" "state. If the UPS is off or has a low battery the plugin will return a " "CRITICAL" msgstr "" -#: plugins/check_ups.c:643 +#: plugins/check_ups.c:646 msgid "" "You may also specify a variable to check (such as temperature, utility " "voltage," msgstr "" -#: plugins/check_ups.c:644 +#: plugins/check_ups.c:647 msgid "" "battery load, etc.) as well as warning and critical thresholds for the value" msgstr "" -#: plugins/check_ups.c:645 +#: plugins/check_ups.c:648 msgid "" "of that variable. If the remote host has multiple UPS that are being " "monitored" msgstr "" -#: plugins/check_ups.c:646 +#: plugins/check_ups.c:649 msgid "you will have to use the --ups option to specify which UPS to check." msgstr "" -#: plugins/check_ups.c:648 +#: plugins/check_ups.c:651 msgid "" "This plugin requires that the UPSD daemon distributed with Russell Kroll's" msgstr "" -#: plugins/check_ups.c:649 +#: plugins/check_ups.c:652 msgid "" "Network UPS Tools be installed on the remote host. If you do not have the" msgstr "" -#: plugins/check_ups.c:650 +#: plugins/check_ups.c:653 msgid "package installed on your system, you can download it from" msgstr "" -#: plugins/check_ups.c:651 +#: plugins/check_ups.c:654 msgid "http://www.networkupstools.org" msgstr "" @@ -5743,30 +5853,30 @@ msgstr "" msgid "urlize http://example.com/ \"check_http -H example.com -r 'two words'\"" msgstr "" -#: plugins/utils.c:437 +#: plugins/utils.c:479 msgid "failed realloc in strpcpy\n" msgstr "" -#: plugins/utils.c:479 +#: plugins/utils.c:521 msgid "failed malloc in strscat\n" msgstr "" -#: plugins/utils.c:499 +#: plugins/utils.c:541 msgid "failed malloc in xvasprintf\n" msgstr "" -#: plugins/utils.c:693 +#: plugins/utils.c:819 msgid "sysconf error for _SC_OPEN_MAX\n" msgstr "" -#: plugins/utils.h:118 +#: plugins/utils.h:127 #, c-format msgid "" " %s (-h | --help) for detailed help\n" " %s (-V | --version) for version information\n" msgstr "" -#: plugins/utils.h:122 +#: plugins/utils.h:131 msgid "" "\n" "Options:\n" @@ -5776,7 +5886,7 @@ msgid "" " Print version information\n" msgstr "" -#: plugins/utils.h:129 +#: plugins/utils.h:138 #, c-format msgid "" " -H, --hostname=ADDRESS\n" @@ -5785,7 +5895,7 @@ msgid "" " Port number (default: %s)\n" msgstr "" -#: plugins/utils.h:135 +#: plugins/utils.h:144 msgid "" " -4, --use-ipv4\n" " Use IPv4 connection\n" @@ -5793,14 +5903,14 @@ msgid "" " Use IPv6 connection\n" msgstr "" -#: plugins/utils.h:141 +#: plugins/utils.h:150 msgid "" " -v, --verbose\n" " Show details for command-line debugging (output may be truncated by\n" " the monitoring system)\n" msgstr "" -#: plugins/utils.h:146 +#: plugins/utils.h:155 msgid "" " -w, --warning=DOUBLE\n" " Response time to result in warning status (seconds)\n" @@ -5808,7 +5918,7 @@ msgid "" " Response time to result in critical status (seconds)\n" msgstr "" -#: plugins/utils.h:152 +#: plugins/utils.h:161 msgid "" " -w, --warning=RANGE\n" " Warning range (format: start:end). Alert if outside this range\n" @@ -5816,21 +5926,21 @@ msgid "" " Critical range\n" msgstr "" -#: plugins/utils.h:158 +#: plugins/utils.h:167 #, c-format msgid "" " -t, --timeout=INTEGER\n" " Seconds before connection times out (default: %d)\n" msgstr "" -#: plugins/utils.h:162 +#: plugins/utils.h:171 #, c-format msgid "" " -t, --timeout=INTEGER\n" " Seconds before plugin times out (default: %d)\n" msgstr "" -#: plugins/utils.h:167 +#: plugins/utils.h:176 msgid "" " --extra-opts=[section][@file]\n" " Read options from an ini file. See\n" @@ -5838,14 +5948,14 @@ msgid "" " for usage and examples.\n" msgstr "" -#: plugins/utils.h:176 +#: plugins/utils.h:185 msgid "" " See:\n" " https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n" " for THRESHOLD format and examples.\n" msgstr "" -#: plugins/utils.h:181 +#: plugins/utils.h:190 msgid "" "\n" "Send email to help@monitoring-plugins.org if you have questions regarding\n" @@ -5854,7 +5964,7 @@ msgid "" "\n" msgstr "" -#: plugins/utils.h:186 +#: plugins/utils.h:195 msgid "" "\n" "The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may " @@ -6184,85 +6294,85 @@ msgstr "" msgid "Unicast testing: mimic a DHCP relay, requires -s" msgstr "" -#: plugins-root/check_icmp.c:1554 +#: plugins-root/check_icmp.c:1569 msgid "specify a target" msgstr "" -#: plugins-root/check_icmp.c:1556 +#: plugins-root/check_icmp.c:1571 msgid "Use IPv4 (default) or IPv6 to communicate with the targets" msgstr "" -#: plugins-root/check_icmp.c:1558 +#: plugins-root/check_icmp.c:1573 msgid "warning threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1561 +#: plugins-root/check_icmp.c:1576 msgid "critical threshold (currently " msgstr "" -#: plugins-root/check_icmp.c:1564 +#: plugins-root/check_icmp.c:1579 msgid "specify a source IP address or device name" msgstr "" -#: plugins-root/check_icmp.c:1566 +#: plugins-root/check_icmp.c:1581 msgid "number of packets to send (currently " msgstr "" -#: plugins-root/check_icmp.c:1569 +#: plugins-root/check_icmp.c:1584 msgid "max packet interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1572 +#: plugins-root/check_icmp.c:1587 msgid "max target interval (currently " msgstr "" -#: plugins-root/check_icmp.c:1575 +#: plugins-root/check_icmp.c:1590 msgid "number of alive hosts required for success" msgstr "" -#: plugins-root/check_icmp.c:1578 +#: plugins-root/check_icmp.c:1593 msgid "TTL on outgoing packets (currently " msgstr "" -#: plugins-root/check_icmp.c:1581 +#: plugins-root/check_icmp.c:1596 msgid "timeout value (seconds, currently " msgstr "" -#: plugins-root/check_icmp.c:1584 +#: plugins-root/check_icmp.c:1599 msgid "Number of icmp data bytes to send" msgstr "" -#: plugins-root/check_icmp.c:1585 +#: plugins-root/check_icmp.c:1600 msgid "Packet size will be data bytes + icmp header (currently" msgstr "" -#: plugins-root/check_icmp.c:1587 +#: plugins-root/check_icmp.c:1602 msgid "verbose" msgstr "" -#: plugins-root/check_icmp.c:1591 +#: plugins-root/check_icmp.c:1606 msgid "The -H switch is optional. Naming a host (or several) to check is not." msgstr "" -#: plugins-root/check_icmp.c:1593 +#: plugins-root/check_icmp.c:1608 msgid "" "Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%" msgstr "" -#: plugins-root/check_icmp.c:1594 +#: plugins-root/check_icmp.c:1609 msgid "packet loss. The default values should work well for most users." msgstr "" -#: plugins-root/check_icmp.c:1595 +#: plugins-root/check_icmp.c:1610 msgid "" "You can specify different RTA factors using the standardized abbreviations" msgstr "" -#: plugins-root/check_icmp.c:1596 +#: plugins-root/check_icmp.c:1611 msgid "" "us (microseconds), ms (milliseconds, default) or just plain s for seconds." msgstr "" -#: plugins-root/check_icmp.c:1602 +#: plugins-root/check_icmp.c:1617 msgid "The -v switch can be specified several times for increased verbosity." msgstr "" diff --git a/release b/release index 2bf1c1c..f90b1af 100644 --- a/release +++ b/release @@ -1 +1 @@ -2.3.1 +2.3.2 diff --git a/tap/Makefile.in b/tap/Makefile.in index bfedc3e..b0def78 100644 --- a/tap/Makefile.in +++ b/tap/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.6 from Makefile.am. +# Makefile.in generated by automake 1.16.3 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -20,23 +19,61 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,8 +92,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = tap -DIST_COMMON = README $(am__include_HEADERS_DIST) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/m4/np_mysqlclient.m4 \ @@ -159,6 +194,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/libcurl.m4 \ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__include_HEADERS_DIST) \ + $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -168,20 +205,46 @@ libtap_la_LIBADD = am__libtap_la_SOURCES_DIST = tap.c tap.h @USE_LIBTAP_LOCAL_TRUE@am_libtap_la_OBJECTS = tap.lo libtap_la_OBJECTS = $(am_libtap_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = @USE_LIBTAP_LOCAL_TRUE@am_libtap_la_rpath = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__depfiles_maybe = depfiles +am__maybe_remake_depfiles = depfiles +am__depfiles_remade = ./$(DEPDIR)/tap.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libtap_la_SOURCES) DIST_SOURCES = $(am__libtap_la_SOURCES_DIST) am__can_run_installinfo = \ @@ -219,14 +282,35 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(includedir)" HEADERS = $(include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/mkinstalldirs README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@ AR = @AR@ ARFLAGS = @ARFLAGS@ @@ -1352,6 +1436,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1380,14 +1465,13 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tap/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu tap/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1401,14 +1485,17 @@ $(am__aclocal_m4_deps): clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libtap.la: $(libtap_la_OBJECTS) $(libtap_la_DEPENDENCIES) $(EXTRA_libtap_la_DEPENDENCIES) - $(LINK) $(am_libtap_la_rpath) $(libtap_la_OBJECTS) $(libtap_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(am_libtap_la_rpath) $(libtap_la_OBJECTS) $(libtap_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1416,28 +1503,34 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tap.Plo@am__quote@ # am--include-marker + +$(am__depfiles_remade): + @$(MKDIR_P) $(@D) + @echo '# dummy' >$@-t && $(am__mv) $@-t $@ + +am--depfiles: $(am__depfiles_remade) .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -1466,26 +1559,15 @@ uninstall-includeHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1497,15 +1579,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1514,11 +1592,29 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1591,7 +1687,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ mostlyclean-am distclean: distclean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/tap.Plo -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1637,7 +1733,7 @@ install-ps-am: installcheck-am: maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) + -rm -f ./$(DEPDIR)/tap.Plo -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1658,19 +1754,22 @@ uninstall-am: uninstall-includeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-includeHEADERS install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-includeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-includeHEADERS install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-includeHEADERS + +.PRECIOUS: Makefile # see top comment