Merge branch 'master' into rename_output_to_cmd_output

author: Lorenz <12514511+RincewindsHat@users.noreply.github.com> 2023-01-09 16:55:10 +0100
committer: GitHub <noreply@github.com> 2023-01-09 16:55:10 +0100
commit: e0ada6f11a82ed6119836482b84c8ba5df491d8f (patch)
tree: 6ddcd5f7850169d82d88dca56a2e5c0dbda08b4e
parent: c389aa4f918aab5cf181aa2cb9dec68b3bf34d4f (diff)
parent: 0899e41f5075d661153eb2c77ace1734a8f66bfa (diff)
download: monitoring-plugins-e0ada6f.tar.gz
31 files changed, 857 insertions, 497 deletions
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..282063c4
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+      time: "04:00"
+    pull-request-branch-name:
+      separator: "-"
+    open-pull-requests-limit: 10
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 4021c104..d8a76da6 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -11,21 +11,51 @@ if [ $(lsb_release -is) = "Debian" ]; then
  apt-add-repository non-free
  apt-get update
 fi
-apt-get -y install perl autotools-dev libdbi-dev libldap2-dev libpq-dev libradcli-dev libnet-snmp-perl procps
+apt-get -y install perl \
-apt-get -y install libdbi0-dev libdbd-sqlite3 libssl-dev dnsutils snmp-mibs-downloader libsnmp-perl snmpd
+        autotools-dev \
-apt-get -y install fping snmp netcat-openbsd smbclient vsftpd apache2 ssl-cert postfix libhttp-daemon-ssl-perl
+        libdbi-dev \
-apt-get -y install libdbd-sybase-perl libnet-dns-perl
+        libldap2-dev \
-apt-get -y install slapd ldap-utils
+        libpq-dev \
-apt-get -y install gcc make autoconf automake gettext
+        libradcli-dev \
-apt-get -y install faketime
+        libnet-snmp-perl \
-apt-get -y install libmonitoring-plugin-perl
+        procps \
-apt-get -y install libcurl4-openssl-dev
+        libdbi0-dev \
-apt-get -y install liburiparser-dev
+        libdbd-sqlite3 \
-apt-get -y install squid
+        libssl-dev \
-apt-get -y install openssh-server
+        dnsutils \
-apt-get -y install mariadb-server mariadb-client libmariadb-dev
+        snmp-mibs-downloader \
-apt-get -y install cron iputils-ping
+        libsnmp-perl \
-apt-get -y install iproute2
+        snmpd \
+        fping \
+        snmp \
+        netcat-openbsd \
+        smbclient \
+        vsftpd \
+        apache2 \
+        ssl-cert \
+        postfix \
+        libhttp-daemon-ssl-perl \
+        libdbd-sybase-perl \
+        libnet-dns-perl \
+        slapd \
+        ldap-utils \
+        gcc \
+        make \
+        autoconf \
+        automake \
+        gettext \
+        faketime \
+        libmonitoring-plugin-perl \
+        libcurl4-openssl-dev \
+        liburiparser-dev \
+        squid \
+        openssh-server \
+        mariadb-server \
+        mariadb-client \
+        libmariadb-dev \
+        cron \
+        iputils-ping \
+        iproute2
 # remove ipv6 interface from hosts
 if [ $(ip addr show | grep "inet6 ::1" | wc -l) -eq "0" ]; then
@@ -37,7 +67,6 @@ ip addr show
 cat /etc/hosts
 # apache
 a2enmod ssl
 a2ensite default-ssl
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index afe6ab4f..ab8bfaae 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -39,11 +39,11 @@ jobs:
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0f93930a..80d49f7e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
          #...
    steps:
      - name: Git clone repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      #- name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
      #  uses: mxschmitt/action-tmate@v3
      - name: Run the tests on ${{ matrix.distro }}
@@ -40,7 +40,7 @@ jobs:
              ${{ matrix.distro }} \
              /bin/sh -c '${{ matrix.prepare }} && \
                tools/setup && \
-                ./configure --enable-libtap --with-ipv6=no && \
+                ./configure --enable-libtap  --with-ipv6=no && \
                make && \
                make test'
          docker container prune -f
diff --git a/AUTHORS b/AUTHORS
index 2d455be3..1b1a0366 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,3 +22,5 @@ Jan Wagner
 Holger Weiss
 Michael Wirtgen
 Oliver Skibbe
+Andreas Baumann
+Lorenz Kästle
diff --git a/NEWS b/NEWS
index 3790e8a0..b674391b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,115 @@
 This file documents the major additions and syntax changes between releases.
-2.4 [...]
+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
        FIXES
+        check_icmp: fix simple typo, conspicuosly -> conspicuously
+        check_curl: fixed help, usage and errors for TLS 1.3
+        check_curl: fixed a potential buffer overflow in url buffer
+        check_dns: split multiple IP addresses passed in one -a argument
+        check_curl: added string_statuscode function for printing HTTP/1.1 and HTTP/2 correctly
+        check_curl: fix crash if http header contains leading spaces
+        check_curl: display a specific human-readable error message where possible
+        check_pgsql: Using snprintf which honors the buffers size and guarantees null termination.
+        check_snmp: put the "c" (to mark a counter) after the perfdata value
+        check_http: Increase regexp limit
+        check_http: make -C obvious
+        check_curl: Increase regexp limit (to 1024 as in check_http)
+        check_curl: make -C obvious (from check_http)
+        check_curl: backported --show-body/-B to print body (from check_http)
 2.3 10th December 2020
        ENHANCEMENTS
@@ -529,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/THANKS.in b/THANKS.in
index 7d1d1ff0..89201404 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -381,3 +381,22 @@ Michael Kraus
 Patrick Rauscher
 Prathamesh Bhanuse
 Valentin Vidic
+Barak Shohat
+Florian Lohoff
+Stefan Bethke
+Tim Gates
+Tomas Mozes
+Aksel Sjögren
+Andreas Motl
+Claudio Kuenzler
+Daniel Uhlmann
+Eric Wunderlin
+Geert Hendrickx
+Ken D
+Klaus Ethgen
+Lee Clemens
+Linda Guo
+Peter Newman
+Tobias Fiebig
+Tobias Wiese
+Wolfgang Karall-Ahlborn
diff --git a/configure.ac b/configure.ac
index 8c5ca70a..87a84a0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -427,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
@@ -776,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"
@@ -786,7 +786,7 @@ 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 | \
-        egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND"] > /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'"
@@ -797,7 +797,7 @@ then
 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'"
@@ -809,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'"
@@ -821,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'"
@@ -831,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'"
@@ -841,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'"
@@ -851,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'"
@@ -863,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"
@@ -876,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"
@@ -886,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'"
@@ -899,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'"
@@ -908,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'"
@@ -918,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'"
@@ -928,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'"
@@ -939,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'"
@@ -948,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'"
@@ -958,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'"
@@ -968,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)"
@@ -978,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)"
@@ -991,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'"
@@ -1003,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)"
@@ -1013,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"
@@ -1027,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]"
@@ -1037,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"
@@ -1105,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"
@@ -1120,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
@@ -1128,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
@@ -1229,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
@@ -1244,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
@@ -1300,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
@@ -1589,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
@@ -1615,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"
@@ -1642,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"
@@ -1844,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/doc/RELEASING.md b/doc/RELEASING.md
index bcd2c5ac..58ec3e16 100644
--- a/doc/RELEASING.md
+++ b/doc/RELEASING.md
@@ -2,14 +2,14 @@ Releasing a New Monitoring Plugins Version
 ==========================================
 Throughout this document, it is assumed that the current Monitoring
-Plugins version is 2.2.1, and that we're about to publish version 2.3.
+Plugins version is 2.3.2, and that we're about to publish version 2.4.
 It is also assumed that the official repository on GitHub is tracked
 using the remote name `monitoring-plugins` (rather than `origin`).
 Before you start
 ----------------
- Check Travis CI status.
+- Check Github Actions status.
 - Update local Git repository to the current `master` tip.  For a
  maintenance release (e.g., version 2.3.2), update to the current
  `maint-2.3` tip, instead.
@@ -55,7 +55,7 @@ Build the tarball
 -----------------
    cd /tmp/plugins
-    tools/setup
+    tools/setup     # requires docbook to be installed
    ./configure
    make dist
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
index c7c9126e..4f16068a 100644
--- a/lib/utils_disk.c
+++ b/lib/utils_disk.c
@@ -28,6 +28,7 @@
 #include "common.h"
 #include "utils_disk.h"
+#include "gl/fsusage.h"
 void
 np_add_name (struct name_list **list, const char *name)
@@ -127,9 +128,12 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
      size_t name_len = strlen(d->name);
      size_t best_match_len = 0;
      struct mount_entry *best_match = NULL;
+      struct fs_usage fsp;
      /* set best match if path name exactly matches a mounted device name */
      for (me = mount_list; me; me = me->me_next) {
+        if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
+          continue; /* skip if permissions do not suffice for accessing device */
        if (strcmp(me->me_devname, d->name)==0)
          best_match = me;
      }
@@ -137,6 +141,8 @@ np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list
      /* set best match by directory name if no match was found by devname */
      if (! best_match) {
        for (me = mount_list; me; me = me->me_next) {
+          if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) < 0)
+            continue; /* skip if permissions do not suffice for accessing device */
          size_t len = strlen (me->me_mountdir);
          if ((exact == FALSE && (best_match_len <= len && len <= name_len &&
             (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0)))
diff --git a/pkg/solaris/solpkg b/pkg/solaris/solpkg
index a21176e4..73b3c647 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/check_icmp.c b/plugins-root/check_icmp.c
index 61198237..1f87b75f 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -213,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)
@@ -223,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;
@@ -452,6 +451,14 @@ main(int argc, char **argv)
                packets = 5;
        }
+        /* support "--help" and "--version" */
+        if(argc == 2) {
+                if(!strcmp(argv[1], "--help"))
+                        strcpy(argv[1], "-h");
+                if(!strcmp(argv[1], "--version"))
+                        strcpy(argv[1], "-V");
+        }
        /* Parse protocol arguments first */
        for(i = 1; i < argc; i++) {
                while((arg = getopt(argc, argv, opts_str)) != EOF) {
@@ -520,7 +527,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);
@@ -556,14 +563,6 @@ main(int argc, char **argv)
        /* Parse extra opts if any */
        argv=np_extra_opts(&argc, argv, progname);
-        /* support "--help" and "--version" */
-        if(argc == 2) {
-                if(!strcmp(argv[1], "--help"))
-                        strcpy(argv[1], "-h");
-                if(!strcmp(argv[1], "--version"))
-                        strcpy(argv[1], "-V");
-        }
        argv = &argv[optind];
        while(*argv) {
                add_target(*argv);
@@ -948,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;
@@ -979,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));
@@ -995,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;
@@ -1016,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;
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index ab4e726e..921e7b36 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -49,10 +49,10 @@ case "$1" in
                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
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index 731aab82..d41e2a6c 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -1,32 +1,32 @@
 /*****************************************************************************
-* 
+*
 * Monitoring check_apt plugin
-* 
+*
 * License: GPL
 * Copyright (c) 2006-2008 Monitoring Plugins Development Team
-* 
+*
 * Original author: Sean Finney
-* 
+*
 * Description:
-* 
+*
 * This file contains the check_apt plugin
-* 
+*
 * Check for available updates in apt package management systems
-* 
+*
-* 
+*
 * 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 <http://www.gnu.org/licenses/>.
-* 
+*
 *****************************************************************************/
 const char *progname = "check_apt";
@@ -76,9 +76,9 @@ int cmpstringp(const void *p1, const void *p2);
 /* configuration variables */
 static int verbose = 0;      /* -v */
-static int list = 0;         /* list packages available for upgrade */
+static bool list = false;         /* list packages available for upgrade */
-static int do_update = 0;    /* whether to call apt-get update */
+static bool do_update = false;    /* whether to call apt-get update */
-static int only_critical = 0;    /* whether to warn about non-critical updates */
+static bool only_critical = false;    /* whether to warn about non-critical updates */
 static upgrade_type upgrade = UPGRADE; /* which type of upgrade to do */
 static char *upgrade_opts = NULL; /* options to override defaults for upgrade */
 static char *update_opts = NULL; /* options to override defaults for update */
@@ -119,7 +119,7 @@ int main (int argc, char **argv) {
        if(sec_count > 0){
                result = max_state(result, STATE_CRITICAL);
-        } else if(packages_available >= packages_warning && only_critical == 0){
+        } else if(packages_available >= packages_warning && only_critical == false){
                result = max_state(result, STATE_WARNING);
        } else if(result > STATE_UNKNOWN){
                result = STATE_UNKNOWN;
@@ -144,7 +144,7 @@ int main (int argc, char **argv) {
                for(i = 0; i < sec_count; i++)
                        printf("%s (security)\n", secpackages_list[i]);
-                if (only_critical == 0) {
+                if (only_critical == false) {
                        for(i = 0; i < packages_available - sec_count; i++)
                                printf("%s\n", packages_list[i]);
                }
@@ -166,7 +166,7 @@ int process_arguments (int argc, char **argv) {
                {"upgrade", optional_argument, 0, 'U'},
                {"no-upgrade", no_argument, 0, 'n'},
                {"dist-upgrade", optional_argument, 0, 'd'},
-                {"list", no_argument, 0, 'l'},
+                {"list", no_argument, false, 'l'},
                {"include", required_argument, 0, 'i'},
                {"exclude", required_argument, 0, 'e'},
                {"critical", required_argument, 0, 'c'},
@@ -212,14 +212,14 @@ int process_arguments (int argc, char **argv) {
                        upgrade=NO_UPGRADE;
                        break;
                case 'u':
-                        do_update=1;
+                        do_update=true;
                        if(optarg!=NULL){
                                update_opts=strdup(optarg);
                                if(update_opts==NULL) die(STATE_UNKNOWN, "strdup failed");
                        }
                        break;
                case 'l':
-                        list=1;
+                        list=true;
                        break;
                case 'i':
                        do_include=add_to_regexp(do_include, optarg);
@@ -231,7 +231,7 @@ int process_arguments (int argc, char **argv) {
                        do_critical=add_to_regexp(do_critical, optarg);
                        break;
                case 'o':
-                        only_critical=1;
+                        only_critical=true;
                        break;
                case INPUT_FILE_OPT:
                        input_filename = optarg;
@@ -269,7 +269,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
                        die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
                }
        }
-   
        if(do_exclude!=NULL){
                regres=regcomp(&ereg, do_exclude, REG_EXTENDED);
                if(regres!=0) {
@@ -278,7 +278,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
                            progname, rerrbuf);
                }
        }
-   
        const char *crit_ptr = (do_critical != NULL) ? do_critical : SECURITY_RE;
        regres=regcomp(&sreg, crit_ptr, REG_EXTENDED);
        if(regres!=0) {
@@ -295,7 +295,7 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
                /* run the upgrade */
                result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
        }
-   
        /* apt-get upgrade only changes exit status if there is an
         * internal error when run in dry-run mode.  therefore we will
         * treat such an error as UNKNOWN */
@@ -371,7 +371,7 @@ int run_update(void){
        struct cmd_output chld_out, chld_err;
        char *cmdline;
-        /* run the upgrade */
+        /* run the update */
        cmdline = construct_cmdline(NO_UPGRADE, update_opts);
        result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
        /* apt-get update changes exit status if it can't fetch packages.
@@ -501,16 +501,6 @@ print_help (void)
  printf(UT_PLUG_TIMEOUT, timeout_interval);
-  printf (" %s\n", "-U, --upgrade=OPTS");
-  printf ("    %s\n", _("[Default] Perform an upgrade.  If an optional OPTS argument is provided,"));
-  printf ("    %s\n", _("apt-get will be run with these command line options instead of the"));
-  printf ("    %s", _("default "));
-  printf ("(%s).\n", UPGRADE_DEFAULT_OPTS);
-  printf ("    %s\n", _("Note that you may be required to have root privileges if you do not use"));
-  printf ("    %s\n", _("the default options."));
-  printf (" %s\n", "-d, --dist-upgrade=OPTS");
-  printf ("    %s\n", _("Perform a dist-upgrade instead of normal upgrade. Like with -U OPTS"));
-  printf ("    %s\n", _("can be provided to override the default options."));
  printf (" %s\n", "-n, --no-upgrade");
  printf ("    %s\n", _("Do not run the upgrade.  Probably not useful (without -u at least)."));
  printf (" %s\n", "-l, --list");
@@ -530,7 +520,7 @@ print_help (void)
  printf ("    %s\n", _("this REGEXP, the plugin will return CRITICAL status.  Can be specified"));
  printf ("    %s\n", _("multiple times like above.  Default is a regexp matching security"));
  printf ("    %s\n", _("upgrades for Debian and Ubuntu:"));
-  printf ("    \t\%s\n", SECURITY_RE);
+  printf ("    \t%s\n", SECURITY_RE);
  printf ("    %s\n", _("Note that the package must first match the include list before its"));
  printf ("    %s\n", _("information is compared against the critical list."));
  printf (" %s\n", "-o, --only-critical");
@@ -547,6 +537,16 @@ print_help (void)
  printf ("    %s\n", _("the default options.  Note: you may also need to adjust the global"));
  printf ("    %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get"));
  printf ("    %s\n", _("upgrade is expected to take longer than the default timeout."));
+  printf (" %s\n", "-U, --upgrade=OPTS");
+  printf ("    %s\n", _("Perform an upgrade. If an optional OPTS argument is provided,"));
+  printf ("    %s\n", _("apt-get will be run with these command line options instead of the"));
+  printf ("    %s", _("default "));
+  printf ("(%s).\n", UPGRADE_DEFAULT_OPTS);
+  printf ("    %s\n", _("Note that you may be required to have root privileges if you do not use"));
+  printf ("    %s\n", _("the default options, which will only run a simulation and NOT perform the upgrade"));
+  printf (" %s\n", "-d, --dist-upgrade=OPTS");
+  printf ("    %s\n", _("Perform a dist-upgrade instead of normal upgrade. Like with -U OPTS"));
+  printf ("    %s\n", _("can be provided to override the default options."));
  printf(UT_SUPPORT);
 }
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 193657c3..4ea721b2 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -50,6 +50,7 @@ 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;
@@ -101,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]);
@@ -180,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'},
@@ -212,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)
@@ -234,6 +243,9 @@ process_arguments (int argc, char **argv)
                        else
                                timeout_interval = atoi (optarg);
                        break;
+                case 'U':
+                        unknown_timeout = TRUE;
+                        break;
                case 'H':                                                                       /* host */
                        hostname = optarg;
                        break;
@@ -445,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"));
@@ -474,7 +488,7 @@ void
 print_usage (void)
 {
        printf ("%s\n", _("Usage:"));
-        printf (" %s -H <host> -C <command> [-fqv] [-1|-2] [-4|-6]\n"
+        printf (" %s -H <host> -C <command> [-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",
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index a69854a8..55de22fd 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -476,6 +476,18 @@ check_http (void)
        printf ("* curl CURLOPT_RESOLVE: %s\n", dnscache);
  }
+  // If server_address is an IPv6 address it must be surround by square brackets
+  struct in6_addr tmp_in_addr;
+  if (inet_pton(AF_INET6, server_address, &tmp_in_addr) == 1) {
+    char *new_server_address = malloc(strlen(server_address) + 3);
+    if (new_server_address == NULL) {
+      die(STATE_UNKNOWN, "HTTP UNKNOWN - Unable to allocate memory\n");
+    }
+    snprintf(new_server_address, strlen(server_address)+3, "[%s]", server_address);
+    free(server_address);
+    server_address = new_server_address;
+  }
  /* compose URL: use the address we want to connect to, set Host: header later */
  snprintf (url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s",
      use_ssl ? "https" : "http",
@@ -999,10 +1011,12 @@ GOT_FIRST_CERT:
  result = max_state_alt(get_status(total_time, thlds), result);
  /* Cut-off trailing characters */
-  if(msg[strlen(msg)-2] == ',')
+  if (strlen(msg) >= 2) {
-    msg[strlen(msg)-2] = '\0';
+      if(msg[strlen(msg)-2] == ',')
-  else
+        msg[strlen(msg)-2] = '\0';
-    msg[strlen(msg)-3] = '\0';
+      else
+        msg[strlen(msg)-3] = '\0';
+    }
  /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
  die (result, "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s",
@@ -2010,9 +2024,12 @@ curlhelp_buffer_write_callback (void *buffer, size_t size, size_t nmemb, void *s
  curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
  while (buf->bufsize < buf->buflen + size * nmemb + 1) {
-    buf->bufsize *= buf->bufsize * 2;
+    buf->bufsize = buf->bufsize * 2;
    buf->buf = (char *)realloc (buf->buf, buf->bufsize);
-    if (buf->buf == NULL) return -1;
+    if (buf->buf == NULL) {
+      fprintf(stderr, "malloc failed (%d) %s\n", errno, strerror(errno));
+      return -1;
+    }
  }
  memcpy (buf->buf + buf->buflen, buffer, size * nmemb);
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 66c5dd39..7018c6fd 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -171,7 +171,6 @@ main (int argc, char **argv)
  char *perf_ilabel;
  char *preamble;
  char *flag_header;
-  double inode_space_pct;
  int temp_result;
  struct mount_entry *me;
@@ -288,7 +287,7 @@ main (int argc, char **argv)
      get_stats (path, &fsp);
      if (verbose >= 3) {
-        printf ("For %s, used_pct=%g free_pct=%g used_units=%llu free_units=%llu total_units=%llu used_inodes_pct=%g free_inodes_pct=%g fsp.fsu_blocksize=%llu mult=%llu\n",
+        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,
@@ -369,10 +368,10 @@ main (int argc, char **argv)
        critical_high_tide = UINT64_MAX;
        if (path->freeinodes_percent->warning != NULL) {
-          warning_high_tide = llabs( 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 = llabs( 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);
@@ -406,15 +405,7 @@ main (int argc, char **argv)
                  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)
@@ -689,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"));
@@ -728,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 ||
@@ -862,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)
 {
@@ -1042,7 +991,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
        get_fs_usage (p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp);
        get_path_stats(p_list, &tmpfsp);
        if (verbose >= 3)
-          printf("Group %s: adding %llu blocks sized %llu, (%s) used_units=%lu free_units=%llu total_units=%llu mult=%llu\n",
+          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,
@@ -1071,7 +1020,7 @@ get_stats (struct parameter_list *p, struct fs_usage *fsp) {
        first = 0;
      }
      if (verbose >= 3)
-        printf("Group %s now has: used_units=%llu free_units=%llu total_units=%llu fsu_blocksize=%llu mult=%llu\n",
+        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,
diff --git a/plugins/check_http.c b/plugins/check_http.c
index f8ec853b..a9c22389 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -31,13 +31,14 @@
 *
 *****************************************************************************/
-/* splint -I. -I../../plugins -I../../lib/ -I/usr/kerberos/include/ ../../plugins/check_http.c */
 const char *progname = "check_http";
-const char *copyright = "1999-2013";
+const char *copyright = "1999-2022";
 const char *email = "devel@monitoring-plugins.org";
+// Do NOT sort those headers, it will break the build
+// TODO: Fix this
 #include "common.h"
+#include "base64.h"
 #include "netutils.h"
 #include "utils.h"
 #include "base64.h"
@@ -57,8 +58,8 @@ enum {
 };
 #ifdef HAVE_SSL
-int check_cert = FALSE;
+bool check_cert = false;
-int continue_after_check_cert = FALSE;
+bool continue_after_check_cert = false;
 int ssl_version = 0;
 int days_till_exp_warn, days_till_exp_crit;
 char *randbuff;
@@ -69,7 +70,7 @@ X509 *server_cert;
 #  define my_recv(buf, len) read(sd, buf, len)
 #  define my_send(buf, len) send(sd, buf, len, 0)
 #endif /* HAVE_SSL */
-int no_body = FALSE;
+bool no_body = false;
 int maximum_age = -1;
 enum {
@@ -91,7 +92,7 @@ struct timeval tv_temp;
 #define HTTP_URL "/"
 #define CRLF "\r\n"
-int specify_port = FALSE;
+bool specify_port = false;
 int server_port = HTTP_PORT;
 int virtual_port = 0;
 char server_port_text[6] = "";
@@ -106,23 +107,21 @@ int server_expect_yn = 0;
 char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
 char header_expect[MAX_INPUT_BUFFER] = "";
 char string_expect[MAX_INPUT_BUFFER] = "";
-char output_header_search[30] = "";
-char output_string_search[30] = "";
 char *warning_thresholds = NULL;
 char *critical_thresholds = NULL;
 thresholds *thlds;
 char user_auth[MAX_INPUT_BUFFER] = "";
 char proxy_auth[MAX_INPUT_BUFFER] = "";
-int display_html = FALSE;
+bool display_html = false;
 char **http_opt_headers;
 int http_opt_headers_count = 0;
 int onredirect = STATE_OK;
 int followsticky = STICKY_NONE;
-int use_ssl = FALSE;
+bool use_ssl = false;
-int use_sni = FALSE;
+bool use_sni = false;
-int verbose = FALSE;
+bool verbose = false;
-int show_extended_perfdata = FALSE;
+bool show_extended_perfdata = false;
-int show_body = FALSE;
+bool show_body = false;
 int sd;
 int min_page_len = 0;
 int max_page_len = 0;
@@ -136,10 +135,11 @@ char buffer[MAX_INPUT_BUFFER];
 char *client_cert = NULL;
 char *client_privkey = NULL;
-int process_arguments (int, char **);
+// Forward function declarations
+bool process_arguments (int, char **);
 int check_http (void);
 void redir (char *pos, char *status_line);
-int server_type_check(const char *type);
+bool server_type_check(const char *type);
 int server_port_check(int ssl_flag);
 char *perfd_time (double microsec);
 char *perfd_time_connect (double microsec);
@@ -150,6 +150,7 @@ char *perfd_time_transfer (double microsec);
 char *perfd_size (int page_len);
 void print_help (void);
 void print_usage (void);
+char *unchunk_content(const char *content);
 int
 main (int argc, char **argv)
@@ -169,10 +170,10 @@ main (int argc, char **argv)
  /* Parse extra opts if any */
  argv=np_extra_opts (&argc, argv, progname);
-  if (process_arguments (argc, argv) == ERROR)
+  if (process_arguments (argc, argv) == false)
    usage4 (_("Could not parse arguments"));
-  if (display_html == TRUE)
+  if (display_html == true)
    printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">",
      use_ssl ? "https" : "http", host_name ? host_name : server_address,
      server_port, server_url);
@@ -195,9 +196,11 @@ test_file (char *path)
  usage2 (_("file does not exist or is not readable"), path);
 }
-/* process command-line arguments */
+/*
-int
+ * process command-line arguments
-process_arguments (int argc, char **argv)
+ * returns true on succes, false otherwise
+  */
+bool process_arguments (int argc, char **argv)
 {
  int c = 1;
  char *p;
@@ -252,7 +255,7 @@ process_arguments (int argc, char **argv)
  };
  if (argc < 2)
-    return ERROR;
+    return false;
  for (c = 1; c < argc; c++) {
    if (strcmp ("-to", argv[c]) == 0)
@@ -308,10 +311,10 @@ process_arguments (int argc, char **argv)
      /* xasprintf (&http_opt_headers, "%s", optarg); */
      break;
    case 'L': /* show html link */
-      display_html = TRUE;
+      display_html = true;
      break;
    case 'n': /* do not show html link */
-      display_html = FALSE;
+      display_html = false;
      break;
    case 'C': /* Check SSL cert validity */
 #ifdef HAVE_SSL
@@ -332,12 +335,12 @@ process_arguments (int argc, char **argv)
          usage2 (_("Invalid certificate expiration period"), optarg);
        days_till_exp_warn = atoi (optarg);
      }
-      check_cert = TRUE;
+      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;
+      continue_after_check_cert = true;
      break;
 #endif
    case 'J': /* use client certificate */
@@ -357,7 +360,7 @@ process_arguments (int argc, char **argv)
    enable_ssl:
      /* ssl_version initialized to 0 as a default. Only set if it's non-zero.  This helps when we include multiple
         parameters, like -S and -C combinations */
-      use_ssl = TRUE;
+      use_ssl = true;
      if (c=='S' && optarg != NULL) {
        int got_plus = strchr(optarg, '+') != NULL;
@@ -374,7 +377,7 @@ process_arguments (int argc, char **argv)
        else
          usage4 (_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional '+' suffix)"));
      }
-      if (specify_port == FALSE)
+      if (specify_port == false)
        server_port = HTTPS_PORT;
 #else
      /* -C -J and -K fall through to here without SSL */
@@ -382,7 +385,7 @@ process_arguments (int argc, char **argv)
 #endif
      break;
    case SNI_OPTION:
-      use_sni = TRUE;
+      use_sni = true;
      break;
    case MAX_REDIRS_OPTION:
      if (!is_intnonneg (optarg))
@@ -420,7 +423,7 @@ process_arguments (int argc, char **argv)
          host_name_length = strlen (host_name) - strlen (p) - 1;
          free (host_name);
          host_name = strndup (optarg, host_name_length);
-          if (specify_port == FALSE)
+          if (specify_port == false)
            server_port = virtual_port;
        }
      } else if ((p = strchr (host_name, ':')) != NULL
@@ -430,7 +433,7 @@ process_arguments (int argc, char **argv)
          host_name_length = strlen (host_name) - strlen (p) - 1;
          free (host_name);
          host_name = strndup (optarg, host_name_length);
-          if (specify_port == FALSE)
+          if (specify_port == false)
            server_port = virtual_port;
        }
      break;
@@ -446,7 +449,7 @@ process_arguments (int argc, char **argv)
        usage2 (_("Invalid port number"), optarg);
      else {
        server_port = atoi (optarg);
-        specify_port = TRUE;
+        specify_port = true;
      }
      break;
    case 'a': /* authorization info */
@@ -502,7 +505,7 @@ process_arguments (int argc, char **argv)
      if (errcode != 0) {
        (void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
        printf (_("Could Not Compile Regular Expression: %s"), errbuf);
-        return ERROR;
+        return false;
      }
      break;
    case INVERT_REGEX:
@@ -519,7 +522,7 @@ process_arguments (int argc, char **argv)
 #endif
      break;
    case 'v': /* verbose */
-      verbose = TRUE;
+      verbose = true;
      break;
    case 'm': /* min_page_length */
      {
@@ -544,7 +547,7 @@ process_arguments (int argc, char **argv)
      break;
      }
    case 'N': /* no-body */
-      no_body = TRUE;
+      no_body = true;
      break;
    case 'M': /* max-age */
                  {
@@ -565,10 +568,10 @@ process_arguments (int argc, char **argv)
                  }
                  break;
    case 'E': /* show extended perfdata */
-      show_extended_perfdata = TRUE;
+      show_extended_perfdata = true;
      break;
    case 'B': /* print body content after status line */
-      show_body = TRUE;
+      show_body = true;
      break;
    }
  }
@@ -605,7 +608,7 @@ process_arguments (int argc, char **argv)
  if (virtual_port == 0)
    virtual_port = server_port;
-  return TRUE;
+  return true;
 }
@@ -945,7 +948,7 @@ check_http (void)
    /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
    if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
-      && host_name != NULL && use_ssl == TRUE) {
+      && host_name != NULL && use_ssl == true) {
    if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT);
    asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent);
@@ -979,7 +982,7 @@ check_http (void)
  }
 #ifdef HAVE_SSL
  elapsed_time_connect = (double)microsec_connect / 1.0e6;
-  if (use_ssl == TRUE) {
+  if (use_ssl == true) {
    gettimeofday (&tv_temp, NULL);
    result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
    if (verbose) printf ("SSL initialized\n");
@@ -987,9 +990,9 @@ check_http (void)
      die (STATE_CRITICAL, NULL);
    microsec_ssl = deltime (tv_temp);
    elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
-    if (check_cert == TRUE) {
+    if (check_cert == true) {
      result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
-      if (continue_after_check_cert == FALSE) {
+      if (continue_after_check_cert == false) {
        if (sd) close(sd);
        np_net_ssl_cleanup();
        return result;
@@ -999,7 +1002,7 @@ check_http (void)
 #endif /* HAVE_SSL */
  if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
-       && host_name != NULL && use_ssl == TRUE)
+       && host_name != NULL && use_ssl == true)
    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
  else
    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
@@ -1027,10 +1030,10 @@ check_http (void)
       * 14.23).  Some server applications/configurations cause trouble if the
       * (default) port is explicitly specified in the "Host:" header line.
       */
-      if ((use_ssl == FALSE && virtual_port == HTTP_PORT) ||
+      if ((use_ssl == false && virtual_port == HTTP_PORT) ||
-          (use_ssl == TRUE && virtual_port == HTTPS_PORT) ||
+          (use_ssl == true && virtual_port == HTTPS_PORT) ||
          (server_address != NULL && strcmp(http_method, "CONNECT") == 0
-         && host_name != NULL && use_ssl == TRUE))
+         && host_name != NULL && use_ssl == true))
        xasprintf (&buf, "%sHost: %s\r\n", buf, host_name);
      else
        xasprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port);
@@ -1070,9 +1073,8 @@ check_http (void)
    }
    xasprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));
-    xasprintf (&buf, "%s%s%s", buf, http_post_data, CRLF);
+    xasprintf (&buf, "%s%s", buf, http_post_data);
-  }
+  } else {
-  else {
    /* or just a newline so the server knows we're done with the request */
    xasprintf (&buf, "%s%s", buf, CRLF);
  }
@@ -1096,9 +1098,14 @@ check_http (void)
      *pos = ' ';
    }
    buffer[i] = '\0';
-    xasprintf (&full_page_new, "%s%s", full_page, buffer);
-    free (full_page);
+    if ((full_page_new = realloc(full_page, pagesize + i + 1)) == NULL)
+        die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate memory for full_page\n"));
+    memmove(&full_page_new[pagesize], buffer, i + 1);
    full_page = full_page_new;
    pagesize += i;
                if (no_body && document_headers_done (full_page)) {
@@ -1110,25 +1117,7 @@ check_http (void)
  elapsed_time_transfer = (double)microsec_transfer / 1.0e6;
  if (i < 0 && errno != ECONNRESET) {
-#ifdef HAVE_SSL
+    die(STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n"));
-    /*
-    if (use_ssl) {
-      sslerr=SSL_get_error(ssl, i);
-      if ( sslerr == SSL_ERROR_SSL ) {
-        die (STATE_WARNING, _("HTTP WARNING - Client Certificate Required\n"));
-      } else {
-        die (STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n"));
-      }
-    }
-    else {
-    */
-#endif
-      die (STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n"));
-#ifdef HAVE_SSL
-      /* XXX
-    }
-    */
-#endif
  }
  /* return a CRITICAL status if we couldn't read any data */
@@ -1253,32 +1242,73 @@ check_http (void)
  }
  /* Page and Header content checks go here */
-  if (strlen (header_expect)) {
+  if (strlen(header_expect) > 0) {
-    if (!strstr (header, header_expect)) {
+    if (strstr(header, header_expect) == NULL) {
-      strncpy(&output_header_search[0],header_expect,sizeof(output_header_search));
+      // We did not find the header, the rest is for building the output and setting the state
-      if(output_header_search[sizeof(output_header_search)-1]!='\0') {
+      char output_header_search[30] = "";
-        bcopy("...",&output_header_search[sizeof(output_header_search)-4],4);
+      strncpy(&output_header_search[0], header_expect,
+              sizeof(output_header_search));
+      if (output_header_search[sizeof(output_header_search) - 1] != '\0') {
+        bcopy("...",
+            &output_header_search[sizeof(output_header_search) - 4],
+            4);
      }
-      xasprintf (&msg, _("%sheader '%s' not found on '%s://%s:%d%s', "), msg, output_header_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
+      xasprintf (&msg,
+          _("%sheader '%s' not found on '%s://%s:%d%s', "),
+          msg,
+          output_header_search, use_ssl ? "https" : "http",
+          host_name ? host_name : server_address, server_port,
+          server_url);
      result = STATE_CRITICAL;
    }
  }
+  // At this point we should test if the content is chunked and unchunk it, so
+  // it can be searched (and possibly printed)
+  const char *chunked_header_regex_string = "Transfer-Encoding: *chunked *";
+  regex_t chunked_header_regex;
+  if (regcomp(&chunked_header_regex, chunked_header_regex_string, REG_ICASE)) {
+    die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN), "Failed to compile chunked_header_regex regex");
+  }
+  regmatch_t chre_pmatch[1]; // We actually do not care about this, since we only want to know IF it was found
+  if (regexec(&chunked_header_regex, header, 1, chre_pmatch, 0) == 0) {
+    if (verbose) {
+      printf("Found chunked content\n");
+    }
+    // We actually found the chunked header
+    char *tmp = unchunk_content(page);
+    if (tmp == NULL) {
+      die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN), "Failed to unchunk message body");
+    }
+    page = tmp;
+  }
-  if (strlen (string_expect)) {
+  if (strlen(string_expect) > 0) {
-    if (!strstr (page, string_expect)) {
+    if (!strstr(page, string_expect)) {
-      strncpy(&output_string_search[0],string_expect,sizeof(output_string_search));
+      // We found the string the body, the rest is for building the output
-      if(output_string_search[sizeof(output_string_search)-1]!='\0') {
+      char output_string_search[30] = "";
-        bcopy("...",&output_string_search[sizeof(output_string_search)-4],4);
+      strncpy(&output_string_search[0], string_expect,
+              sizeof(output_string_search));
+      if (output_string_search[sizeof(output_string_search) - 1] != '\0') {
+        bcopy("...", &output_string_search[sizeof(output_string_search) - 4],
+              4);
      }
      xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
      result = STATE_CRITICAL;
    }
  }
-  if (strlen (regexp)) {
+  if (strlen(regexp) > 0) {
-    errcode = regexec (&preg, page, REGS, pmatch, 0);
+    errcode = regexec(&preg, page, REGS, pmatch, 0);
-    if ((errcode == 0 && invert_regex == 0) || (errcode == REG_NOMATCH && invert_regex == 1)) {
+    if ((errcode == 0 && invert_regex == 0) ||
+        (errcode == REG_NOMATCH && invert_regex == 1)) {
      /* OK - No-op to avoid changing the logic around it */
      result = max_state_alt(STATE_OK, result);
    }
@@ -1330,7 +1360,7 @@ check_http (void)
           perfd_time (elapsed_time),
           perfd_size (page_len),
           perfd_time_connect (elapsed_time_connect),
-           use_ssl == TRUE ? perfd_time_ssl (elapsed_time_ssl) : "",
+           use_ssl == true ? perfd_time_ssl (elapsed_time_ssl) : "",
           perfd_time_headers (elapsed_time_headers),
           perfd_time_firstbyte (elapsed_time_firstbyte),
           perfd_time_transfer (elapsed_time_transfer));
@@ -1352,7 +1382,88 @@ check_http (void)
  return STATE_UNKNOWN;
 }
+/* Receivces a pointer to the beginning of the body of a HTTP message
+ * which is chunked and returns a pointer to a freshly allocated memory
+ * region containing the unchunked body or NULL if something failed.
+ * The result must be freed by the caller.
+ */
+char *unchunk_content(const char *content) {
+  // https://en.wikipedia.org/wiki/Chunked_transfer_encoding
+  // https://www.rfc-editor.org/rfc/rfc7230#section-4.1
+  char *result = NULL;
+  size_t content_length = strlen(content);
+  char *start_of_chunk;
+  char* end_of_chunk;
+  long size_of_chunk;
+  const char *pointer = content;
+  char *endptr;
+  long length_of_chunk = 0;
+  size_t overall_size = 0;
+  char *result_ptr;
+  while (true) {
+    size_of_chunk = strtol(pointer, &endptr, 16);
+    if (size_of_chunk == LONG_MIN || size_of_chunk == LONG_MAX) {
+      // Apparently underflow or overflow, should not happen
+      if (verbose) {
+        printf("Got an underflow or overflow from strtol at: %u\n", __LINE__);
+      }
+      return NULL;
+    }
+    if (endptr == pointer) {
+      // Apparently this was not a number
+      if (verbose) {
+        printf("Chunked content did not start with a number at all (Line: %u)\n", __LINE__);
+      }
+      return NULL;
+    }
+    // So, we got the length of the chunk
+    if (*endptr == ';') {
+      // Chunk extension starts here
+      while (*endptr != '\r') {
+        endptr++;
+      }
+    }
+    start_of_chunk = endptr + 2;
+    end_of_chunk = start_of_chunk + size_of_chunk;
+    length_of_chunk = (long)(end_of_chunk - start_of_chunk);
+    pointer = end_of_chunk + 2; //Next number should be here
+    if (length_of_chunk == 0) {
+      // Chunk length is 0, so this is the last one
+      break;
+    }
+    overall_size += length_of_chunk;
+    if (result == NULL) {
+      result = (char *)calloc(length_of_chunk, sizeof(char));
+      if (result == NULL) {
+        if (verbose) {
+          printf("Failed to allocate memory for unchunked body\n");
+        }
+        return NULL;
+      }
+      result_ptr = result;
+    } else {
+      void *tmp = realloc(result, overall_size);
+      if (tmp == NULL) {
+        if (verbose) {
+          printf("Failed to allocate memory for unchunked body\n");
+        }
+        return NULL;
+      }
+    }
+    memcpy(result_ptr, start_of_chunk, size_of_chunk);
+    result_ptr = result_ptr + size_of_chunk;
+  }
+  result[overall_size] = '\0';
+  return result;
+}
 /* per RFC 2396 */
 #define URI_HTTP "%5[HTPShtps]"
@@ -1363,7 +1474,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)
@@ -1440,9 +1553,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, '/')))
@@ -1511,13 +1636,13 @@ redir (char *pos, char *status_line)
 }
-int
+bool
 server_type_check (const char *type)
 {
  if (strcmp (type, "https"))
-    return FALSE;
+    return false;
  else
-    return TRUE;
+    return true;
 }
 int
@@ -1532,42 +1657,42 @@ server_port_check (int ssl_flag)
 char *perfd_time (double elapsed_time)
 {
  return fperfdata ("time", elapsed_time, "s",
-            thlds->warning?TRUE:FALSE, thlds->warning?thlds->warning->end:0,
+            thlds->warning?true:false, thlds->warning?thlds->warning->end:0,
-            thlds->critical?TRUE:FALSE, thlds->critical?thlds->critical->end:0,
+            thlds->critical?true:false, thlds->critical?thlds->critical->end:0,
-                   TRUE, 0, TRUE, socket_timeout);
+                   true, 0, true, socket_timeout);
 }
 char *perfd_time_connect (double elapsed_time_connect)
 {
-  return fperfdata ("time_connect", elapsed_time_connect, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
+  return fperfdata ("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 char *perfd_time_ssl (double elapsed_time_ssl)
 {
-  return fperfdata ("time_ssl", elapsed_time_ssl, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
+  return fperfdata ("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 char *perfd_time_headers (double elapsed_time_headers)
 {
-  return fperfdata ("time_headers", elapsed_time_headers, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
+  return fperfdata ("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 char *perfd_time_firstbyte (double elapsed_time_firstbyte)
 {
-  return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
+  return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 char *perfd_time_transfer (double elapsed_time_transfer)
 {
-  return fperfdata ("time_transfer", elapsed_time_transfer, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
+  return fperfdata ("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
 }
 char *perfd_size (int page_len)
 {
  return perfdata ("size", page_len, "B",
-            (min_page_len>0?TRUE:FALSE), min_page_len,
+            (min_page_len>0?true:false), min_page_len,
-            (min_page_len>0?TRUE:FALSE), 0,
+            (min_page_len>0?true:false), 0,
-            TRUE, 0, FALSE, 0);
+            true, 0, false, 0);
 }
 void
diff --git a/plugins/check_load.c b/plugins/check_load.c
index fdfa1da8..388714f2 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 <http://www.gnu.org/licenses/>.
-* 
+*
-* 
+*
 *****************************************************************************/
 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 "./common.h"
-#include "runcmd.h"
+#include "./runcmd.h"
-#include "utils.h"
+#include "./utils.h"
-#include "popen.h"
+#include "./popen.h"
+#include <string.h>
 #ifdef HAVE_SYS_LOADAVG_H
 #include <sys/loadavg.h>
@@ -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);
+        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);
+        }
        for(i = 0; i < 3; i++) {
-                if(la[i] > cload[i]) {
+                if (is_using_scaled_load_values) {
-                        result = STATE_CRITICAL;
+                        if(scaled_la[i] > cload[i]) {
-                        break;
+                                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;
                }
-                else if(la[i] > wload[i]) result = STATE_WARNING;
        }
        printf("LOAD %s - %s|", state_text(result), status_line);
-        for(i = 0; i < 3; i++)
+        for(i = 0; i < 3; i++) {
-                printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[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", _("Exit with WARNING status if load average exceeds WLOADn"));
-  printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15");
+        printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15");
-  printf ("    %s\n", _("Exit with CRITICAL status if load average exceed CLOADn"));
+        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", _("the load average format is the same used by \"uptime\" and \"w\""));
-  printf (" %s\n", "-r, --percpu");
+        printf (" %s\n", "-r, --percpu");
-  printf ("    %s\n", _("Divide the load averages by the number of CPUs (when possible)"));
+        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", "-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 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", _("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\n", _("Usage:"));
-  printf ("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", progname);
+        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)
+        int lines_to_show = chld_out.lines < (size_t)(n_procs_to_show + 1)
-                        ? chld_out.lines : 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 914b40ce..8b776ba1 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<num_hosts; j++){ close(socklist[j]); } */
        free(socklist);
        free(ufds);
@@ -512,7 +512,7 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
 }
 /* XXX handle responses with the error bit set */
-double jitter_request(const char *host, int *status){
+double jitter_request(int *status){
        int conn=-1, i, npeers=0, num_candidates=0, syncsource_found=0;
        int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0;
        int peers_size=0, peer_offset=0;
@@ -803,7 +803,7 @@ int main(int argc, char *argv[]){
         * (for example) will result in an error
         */
        if(do_jitter){
-                jitter=jitter_request(server_address, &jitter_result);
+                jitter=jitter_request(&jitter_result);
                result = max_state_alt(result, get_status(jitter, jitter_thresholds));
                /* -1 indicates that we couldn't calculate the jitter
                 * Only overrides STATE_OK from the offset */
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index c893386c..c26cd439 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -69,7 +69,6 @@ int process_arguments (int, char **);
 int validate_arguments (void);
 void print_usage (void);
 void print_help (void);
-int is_pg_dbname (char *);
 int is_pg_logname (char *);
 int do_query (PGconn *, char *);
@@ -347,10 +346,10 @@ process_arguments (int argc, char **argv)
                                pgport = optarg;
                        break;
                case 'd':     /* database name */
-                        if (!is_pg_dbname (optarg)) /* checks length and valid chars */
+                        if (strlen(optarg) >= NAMEDATALEN) {
-                                usage2 (_("Database name is not valid"), optarg);
+                                usage2 (_("Database name exceeds the maximum length"), optarg);
-                        else /* we know length, and know optarg is terminated, so us strcpy */
+                        }
-                                snprintf(dbName, NAMEDATALEN, "%s", optarg);
+                        snprintf(dbName, NAMEDATALEN, "%s", optarg);
                        break;
                case 'l':     /* login name */
                        if (!is_pg_logname (optarg))
@@ -414,45 +413,6 @@ validate_arguments ()
        return OK;
 }
-/******************************************************************************
-@@-
-<sect3>
-<title>is_pg_dbname</title>
-<para>&PROTO_is_pg_dbname;</para>
-<para>Given a database name, this function returns TRUE if the string
-is a valid PostgreSQL database name, and returns false if it is
-not.</para>
-<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
-characters long and consist of letters, numbers, and underscores. The
-first character cannot be a number, however.</para>
-</sect3>
-@@
-******************************************************************************/
-int
-is_pg_dbname (char *dbname)
-{
-        char txt[NAMEDATALEN];
-        char tmp[NAMEDATALEN];
-        if (strlen (dbname) > NAMEDATALEN - 1)
-                return (FALSE);
-        strncpy (txt, dbname, NAMEDATALEN - 1);
-        txt[NAMEDATALEN - 1] = 0;
-        if (sscanf (txt, "%[_a-zA-Z]%[^_a-zA-Z0-9-]", tmp, tmp) == 1)
-                return (TRUE);
-        if (sscanf (txt, "%[_a-zA-Z]%[_a-zA-Z0-9-]%[^_a-zA-Z0-9-]", tmp, tmp, tmp) ==
-                        2) return (TRUE);
-        return (FALSE);
-}
 /**
 the tango program should eventually create an entity here based on the
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 205f7ee8..67aa6be1 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,31 +1,31 @@
 /*****************************************************************************
-* 
+*
 * Monitoring check_snmp plugin
-* 
+*
 * License: GPL
 * Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
+*
 * Description:
-* 
+*
 * This file contains the check_snmp plugin
-* 
+*
 * Check status of remote machines and obtain system information via SNMP
-* 
+*
-* 
+*
 * 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 <http://www.gnu.org/licenses/>.
-* 
+*
-* 
+*
 *****************************************************************************/
 const char *progname = "check_snmp";
@@ -90,6 +90,7 @@ char *thisarg (char *str);
 char *nextarg (char *str);
 void print_usage (void);
 void print_help (void);
+char *multiply (char *str);
 #include "regex.h"
 char regex_expect[MAX_INPUT_BUFFER] = "";
@@ -154,6 +155,8 @@ double *previous_value;
 size_t previous_size = OID_COUNT_STEP;
 int perf_labels = 1;
 char* ip_version = "";
+double multiplier = 1.0;
+char *fmtstr = "";
 static char *fix_snmp_range(char *th)
 {
@@ -316,7 +319,7 @@ main (int argc, char **argv)
        for (i = 0; i < numcontext; i++) {
                command_line[10 + i] = contextargs[i];
        }
-        
        for (i = 0; i < numauthpriv; i++) {
                command_line[10 + numcontext + i] = authpriv[i];
        }
@@ -330,7 +333,7 @@ main (int argc, char **argv)
        for (i = 0; i < numoids; i++) {
                command_line[10 + numcontext + numauthpriv + 1 + i] = oids[i];
-                xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);   
+                xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);
        }
        command_line[10 + numcontext + numauthpriv + 1 + numoids] = NULL;
@@ -376,7 +379,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
@@ -398,15 +401,15 @@ main (int argc, char **argv)
                is_counter=0;
                /* We strip out the datatype indicator for PHBs */
                if (strstr (response, "Gauge: ")) {
-                        show = strstr (response, "Gauge: ") + 7;
+                        show = multiply (strstr (response, "Gauge: ") + 7);
-                } 
+                }
                else if (strstr (response, "Gauge32: ")) {
-                        show = strstr (response, "Gauge32: ") + 9;
+                        show = multiply (strstr (response, "Gauge32: ") + 9);
-                } 
+                }
                else if (strstr (response, "Counter32: ")) {
                        show = strstr (response, "Counter32: ") + 11;
                        is_counter=1;
-                        if(!calculate_rate) 
+                        if(!calculate_rate)
                                strcpy(type, "c");
                }
                else if (strstr (response, "Counter64: ")) {
@@ -416,7 +419,10 @@ main (int argc, char **argv)
                                strcpy(type, "c");
                }
                else if (strstr (response, "INTEGER: ")) {
-                        show = strstr (response, "INTEGER: ") + 9;
+                        show = multiply (strstr (response, "INTEGER: ") + 9);
+                        if (fmtstr != "") {
+                                conv = fmtstr;
+                        }
                }
                else if (strstr (response, "OID: ")) {
                        show = strstr (response, "OID: ") + 5;
@@ -616,7 +622,7 @@ main (int argc, char **argv)
                state_string=malloc(string_length);
                if(state_string==NULL)
                        die(STATE_UNKNOWN, _("Cannot malloc"));
-                
                current_length=0;
                for(i=0; i<total_oids; i++) {
                        xasprintf(&temp_string,"%.0f",response_value[i]);
@@ -638,7 +644,7 @@ main (int argc, char **argv)
                state_string[--current_length]='\0';
                if (verbose > 2)
                        printf("State string=%s\n",state_string);
-                
                /* This is not strictly the same as time now, but any subtle variations will cancel out */
                np_state_write_string(current_time, state_string );
                if(previous_state==NULL) {
@@ -698,6 +704,8 @@ process_arguments (int argc, char **argv)
                {"perf-oids", no_argument, 0, 'O'},
                {"ipv4", no_argument, 0, '4'},
                {"ipv6", no_argument, 0, '6'},
+                {"multiplier", required_argument, 0, 'M'},
+                {"fmtstr", required_argument, 0, 'f'},
                {0, 0, 0, 0}
        };
@@ -715,7 +723,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:z:",
+                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:M:f:z:",
                                                                         longopts, &option);
                if (c == -1 || c == EOF)
@@ -953,6 +961,16 @@ process_arguments (int argc, char **argv)
                        if(verbose>2)
                                printf("IPv6 detected! Will pass \"udp6:\" to snmpget.\n");
                        break;
+                case 'M':
+                        if ( strspn( optarg, "0123456789.," ) == strlen( optarg ) ) {
+                                multiplier=strtod(optarg,NULL);
+                        }
+                        break;
+                case 'f':
+                        if (multiplier != 1.0) {
+                                fmtstr=optarg;
+                        }
+                        break;
                }
        }
@@ -1022,7 +1040,7 @@ validate_arguments ()
                        contextargs[0] = strdup ("-n");
                        contextargs[1] = strdup (context);
                }
-                
                if (seclevel == NULL)
                        xasprintf(&seclevel, "noAuthNoPriv");
@@ -1143,6 +1161,25 @@ nextarg (char *str)
+/* multiply result (values 0 < n < 1 work as divider) */
+char *
+multiply (char *str)
+{
+        double val = strtod (str, NULL);
+        val *= multiplier;
+        char *conv = "%f";
+        if (fmtstr != "") {
+                conv = fmtstr;
+        }
+        if (val == (int)val) {
+                sprintf(str, "%.0f", val);
+        } else {
+                sprintf(str, conv, val);
+        }
+        return str;
+}
 void
 print_help (void)
 {
@@ -1235,6 +1272,10 @@ print_help (void)
        printf ("    %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
        printf (" %s\n", "-D, --output-delimiter=STRING");
        printf ("    %s\n", _("Separates output on multiple OID requests"));
+        printf (" %s\n", "-M, --multiplier=FLOAT");
+        printf ("    %s\n", _("Multiplies current value, 0 < n < 1 works as divider, defaults to 1"));
+        printf (" %s\n", "-f, --fmtstr=STRING");
+        printf ("    %s\n", _("C-style format string for float values (see option -M)"));
        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
        printf ("    %s\n", _("NOTE the final timeout value is calculated using this formula: timeout_interval * retries + 5"));
@@ -1287,4 +1328,5 @@ print_usage (void)
        printf ("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
        printf ("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
        printf ("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd] [-4|6]\n");
+        printf ("[-M multiplier [-f format]]\n");
 }
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index bb854beb..a607da1e 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 <http://www.gnu.org/licenses/>.
-* 
+*
-* 
+*
 *****************************************************************************/
 const char *progname = "check_swap";
@@ -150,7 +150,7 @@ main (int argc, char **argv)
                 * 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]%*[:] %f %*[k]%*[B]", str, &tmp_KB)) {
+                else if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFreCchd]%*[:] %lu %*[k]%*[B]", str, &tmp_KB)) {
                        if (verbose >= 3) {
                                printf("Got %s with %lu\n", str, tmp_KB);
                        }
@@ -389,7 +389,7 @@ main (int argc, char **argv)
                        TRUE, warn_print,
                        TRUE, crit_print,
                        TRUE, 0,
-                        TRUE, (long) total_swap_mb));
+                        TRUE, (long) total_swap_mb * 1024 * 1024));
        return result;
 }
@@ -410,7 +410,6 @@ check_swap(float free_swap_mb, float total_swap_mb)
        uint64_t usage_percentage = ((total_swap_mb - free_swap_mb) / total_swap_mb) * 100;
        if (crit.is_percentage &&
-                        usage_percentage >= 0 &&
                        crit.value != 0 &&
                        usage_percentage >= (100 - crit.value))
        {
@@ -418,7 +417,6 @@ check_swap(float free_swap_mb, float total_swap_mb)
        }
        if (warn.is_percentage &&
-                        usage_percentage >= 0 &&
                        warn.value != 0 &&
                        usage_percentage >= (100 - warn.value))
        {
@@ -475,10 +473,9 @@ process_arguments (int argc, char **argv)
                                        if (is_uint64(optarg, &warn.value)) {
                                                if (warn.value > 100) {
                                                        usage4 (_("Warning threshold percentage must be <= 100!"));
-                                                } else {
-                                                        break;
                                                }
                                        }
+                                        break;
                                } else {
                                        /* It's Bytes */
                                        warn.is_percentage = 0;
@@ -506,10 +503,9 @@ process_arguments (int argc, char **argv)
                                        if (is_uint64(optarg, &crit.value)) {
                                                if (crit.value> 100) {
                                                        usage4 (_("Critical threshold percentage must be <= 100!"));
-                                                } else {
-                                                        break;
                                                }
                                        }
+                                        break;
                                } else {
                                        /* It's Bytes */
                                        crit.is_percentage = 0;
@@ -527,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;
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t
index ada6a045..eae98cc1 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -1,15 +1,22 @@
 #! /usr/bin/perl -w -I ..
 #
-# HyperText Transfer Protocol (HTTP) Test via check_http
+# HyperText Transfer Protocol (HTTP) Test via check_curl
 #
 #
 use strict;
 use Test::More;
 use POSIX qw/mktime strftime/;
-use NPTest;
-plan tests => 58;
+use vars qw($tests $has_ipv6);
+BEGIN {
+    use NPTest;
+    $has_ipv6 = NPTest::has_ipv6();
+    $tests = $has_ipv6 ? 59 : 57;
+    plan tests => $tests;
+}
 my $successOutput = '/OK.*HTTP.*second/';
@@ -18,6 +25,7 @@ my $plugin = 'check_http';
 $plugin    = 'check_curl' if $0 =~ m/check_curl/mx;
 my $host_tcp_http      = getTestParameter("NP_HOST_TCP_HTTP", "A host providing the HTTP Service (a web server)", "localhost");
+my $host_tcp_http_ipv6      = getTestParameter("NP_HOST_TCP_HTTP_IPV6", "An IPv6 address providing a HTTP Service (a web server)", "::1");
 my $host_tls_http      = getTestParameter("NP_HOST_TLS_HTTP", "A host providing the HTTPS Service (a tls web server)", "localhost");
 my $host_tls_cert      = getTestParameter("NP_HOST_TLS_CERT", "the common name of the certificate.", "localhost");
 my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1");
@@ -31,26 +39,35 @@ my $faketime = -x '/usr/bin/faketime' ? 1 : 0;
 $res = NPTest->testCmd(
-        "./$plugin $host_tcp_http -wt 300 -ct 600"
+    "./$plugin $host_tcp_http -wt 300 -ct 600"
-        );
+    );
 cmp_ok( $res->return_code, '==', 0, "Webserver $host_tcp_http responded" );
 like( $res->output, $successOutput, "Output OK" );
+if ($has_ipv6) {
+    # Test for IPv6 formatting
+    $res = NPTest->testCmd(
+        "./$plugin -I $host_tcp_http_ipv6 -wt 300 -ct 600"
+        );
+    cmp_ok( $res->return_code, '==', 0, "IPv6 URL formatting is working" );
+    like( $res->output, $successOutput, "Output OK" );
+}
 $res = NPTest->testCmd(
-        "./$plugin $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there' -k 'carl:frown'"
+    "./$plugin $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there' -k 'carl:frown'"
-        );
+    );
 like( $res->output, '/bob:there\r\ncarl:frown\r\n/', "Got headers with multiple -k options" );
 $res = NPTest->testCmd(
-        "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3"
+    "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3"
-        );
+    );
 cmp_ok( $res->return_code, '==', 2, "Webserver $host_nonresponsive not responding" );
 # was CRITICAL only, but both check_curl and check_http print HTTP CRITICAL (puzzle?!)
 like( $res->output, "/HTTP CRITICAL - Invalid HTTP response received from host on port 80: cURL returned 28 - Connection timed out after/", "Output OK");
 $res = NPTest->testCmd(
-        "./$plugin $hostname_invalid -wt 1 -ct 2"
+    "./$plugin $hostname_invalid -wt 1 -ct 2"
-        );
+    );
 cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
 # The first part of the message comes from the OS catalogue, so cannot check this.
 # On Debian, it is Name or service not known, on Darwin, it is No address associated with nodename
@@ -188,11 +205,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 curl" );
        is( $res->return_code, 0, "Redirection based on location is okay");
diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index c137f7b4..1ca52f61 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", 23 if $internet_access eq "no";
+        skip "No internet access", 22 if $internet_access eq "no";
        $res = NPTest->testCmd(
                "./$plugin --ssl $host_tls_http"
@@ -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 60837ef6..bba8947c 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 = "/^LOAD OK - load average: $loadValue, $loadValue, $loadValue/";
+my $successOutput = "/^LOAD OK - total load average: $loadValue, $loadValue, $loadValue/";
-my $failureOutput = "/^LOAD CRITICAL - 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/tests/check_curl.t b/plugins/tests/check_curl.t
index aa72ef67..72f2b7c2 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -21,7 +21,7 @@ use FindBin qw($Bin);
 $ENV{'LC_TIME'} = "C";
-my $common_tests = 72;
+my $common_tests = 73;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval "use HTTP::Daemon 6.01;";
@@ -200,6 +200,14 @@ sub run_server {
                                $c->send_basic_header;
                                $c->send_crlf;
                                $c->send_response(HTTP::Response->new( 200, 'OK', undef, $r->header ('Host')));
+                        } elsif ($r->url->path eq "/chunked") {
+                                my $chunks = ["chunked", "encoding", "test\n"];
+                                $c->send_response(HTTP::Response->new( 200, 'OK', undef, sub {
+                                        my $chunk = shift @{$chunks};
+                                        return unless $chunk;
+                                        sleep(1);
+                                        return($chunk);
+                                }));
                        } else {
                                $c->send_error(HTTP::Status->RC_FORBIDDEN);
                        }
@@ -472,7 +480,8 @@ sub run_common_tests {
                local $SIG{ALRM} = sub { die "alarm\n" };
                alarm(2);
                $result = NPTest->testCmd( $cmd );
-                alarm(0);       };
+        };
+        alarm(0);
        isnt( $@, "alarm\n", $cmd );
        is( $result->return_code, 0, $cmd );
@@ -482,7 +491,8 @@ sub run_common_tests {
                local $SIG{ALRM} = sub { die "alarm\n" };
                alarm(2);
                $result = NPTest->testCmd( $cmd );
-                alarm(0); };
+        };
+        alarm(0);
        isnt( $@, "alarm\n", $cmd );
        isnt( $result->return_code, 0, $cmd );
@@ -508,4 +518,9 @@ sub run_common_tests {
        };
        is( $@, "", $cmd );
+        $cmd = "$command -u /chunked -s 'chunkedencodingtest' -d 'Transfer-Encoding: chunked'";
+        eval {
+                $result = NPTest->testCmd( $cmd, 5 );
+        };
+        is( $@, "", $cmd );
 }
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index ea11b2ac..d766ac37 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -12,7 +12,7 @@ use FindBin qw($Bin);
 $ENV{'LC_TIME'} = "C";
-my $common_tests = 70;
+my $common_tests = 71;
 my $virtual_port_tests = 8;
 my $ssl_only_tests = 12;
 # Check that all dependent modules are available
@@ -190,6 +190,14 @@ sub run_server {
                                        $c->send_basic_header;
                                        $c->send_crlf;
                                        $c->send_response(HTTP::Response->new( 200, 'OK', undef, $r->header ('Host')));
+                                } elsif ($r->url->path eq "/chunked") {
+                                        my $chunks = ["chunked", "encoding", "test\n"];
+                                        $c->send_response(HTTP::Response->new( 200, 'OK', undef, sub {
+                                                my $chunk = shift @{$chunks};
+                                                return unless $chunk;
+                                                sleep(1);
+                                                return($chunk);
+                                        }));
                                } else {
                                        $c->send_error(HTTP::Status->RC_FORBIDDEN);
                                }
@@ -497,4 +505,9 @@ sub run_common_tests {
        };
        is( $@, "", $cmd );
+        $cmd = "$command -u /chunked -s 'chunkedencodingtest' -d 'Transfer-Encoding: chunked'";
+        eval {
+                $result = NPTest->testCmd( $cmd, 5 );
+        };
+        is( $@, "", $cmd );
 }
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index 0a77fa8a..bc03ec60 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 = 73;
+my $tests = 81;
 # Check that all dependent modules are available
 eval {
        require NetSNMP::OID;
@@ -57,9 +57,9 @@ if ($pid) {
        exec("snmpd -c tests/conf/snmpd.conf -C -f -r udp:$port_snmp");
 }
-END { 
+END {
        foreach my $pid (@pids) {
-                if ($pid) { print "Killing $pid\n"; kill "INT", $pid } 
+                if ($pid) { print "Killing $pid\n"; kill "INT", $pid }
        }
 };
@@ -268,3 +268,19 @@ like($res->output, '/SNMP WARNING - \d+ \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d
 $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" );
+$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.19");
+is($res->return_code, 0, "Test plain .1.3.6.1.4.1.8072.3.2.67.6 RC" );
+is($res->output,'SNMP OK - 42 | iso.3.6.1.4.1.8072.3.2.67.19=42 ', "Test plain value of .1.3.6.1.4.1.8072.3.2.67.1" );
+$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.19 -M .1");
+is($res->return_code, 0, "Test multiply RC" );
+is($res->output,'SNMP OK - 4.200000 | iso.3.6.1.4.1.8072.3.2.67.19=4.200000 ' , "Test multiply .1 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.19 --multiplier=.1 -f '%.2f' ");
+is($res->return_code, 0, "Test multiply RC + format" );
+is($res->output, 'SNMP OK - 4.20 | iso.3.6.1.4.1.8072.3.2.67.19=4.20 ', "Test multiply .1 output + format" );
+$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.19 --multiplier=.1 -f '%.2f' -w 1");
+is($res->return_code, 1, "Test multiply RC + format + thresholds" );
+is($res->output, 'SNMP WARNING - *4.20* | iso.3.6.1.4.1.8072.3.2.67.19=4.20;1 ', "Test multiply .1 output + format + thresholds" );
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 0e41d575..38912e98 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -32,11 +32,11 @@ my $multilin5 = 'And now have fun with with this: "C:\\"
 because we\'re not done yet!';
 # Next are arrays of indexes (Type, initial value and increments)
-# 0..16 <---- please update comment when adding/removing fields
+# 0..19 <---- please update comment when adding/removing fields
-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR );
+my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER );
-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6' );
+my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6', 42 );
 # undef increments are randomized
-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef );
+my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef, 0 );
 # Number of elements in our OID
 my $oidelts;
diff --git a/plugins/utils.c b/plugins/utils.c
index 17dd5814..b4214c61 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -615,27 +615,27 @@ char *perfdata_uint64 (const char *label,
        char *data = NULL;
        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
+                xasprintf (&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
        else
-                xasprintf (&data, "%s=%ld%s;", label, val, uom);
+                xasprintf (&data, "%s=%" PRIu64 "%s;", label, val, uom);
        if (warnp)
-                xasprintf (&data, "%s%lu;", data, warn);
+                xasprintf (&data, "%s%" PRIu64 ";", data, warn);
        else
                xasprintf (&data, "%s;", data);
        if (critp)
-                xasprintf (&data, "%s%lu;", data, crit);
+                xasprintf (&data, "%s%" PRIu64 ";", data, crit);
        else
                xasprintf (&data, "%s;", data);
        if (minp)
-                xasprintf (&data, "%s%lu;", data, minv);
+                xasprintf (&data, "%s%" PRIu64 ";", data, minv);
        else
                xasprintf (&data, "%s;", data);
        if (maxp)
-                xasprintf (&data, "%s%lu", data, maxv);
+                xasprintf (&data, "%s%" PRIu64, data, maxv);
        return data;
 }
@@ -656,27 +656,27 @@ char *perfdata_int64 (const char *label,
        char *data = NULL;
        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
+                xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
        else
-                xasprintf (&data, "%s=%ld%s;", label, val, uom);
+                xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
        if (warnp)
-                xasprintf (&data, "%s%ld;", data, warn);
+                xasprintf (&data, "%s%" PRId64 ";", data, warn);
        else
                xasprintf (&data, "%s;", data);
        if (critp)
-                xasprintf (&data, "%s%ld;", data, crit);
+                xasprintf (&data, "%s%" PRId64 ";", data, crit);
        else
                xasprintf (&data, "%s;", data);
        if (minp)
-                xasprintf (&data, "%s%ld;", data, minv);
+                xasprintf (&data, "%s%" PRId64 ";", data, minv);
        else
                xasprintf (&data, "%s;", data);
        if (maxp)
-                xasprintf (&data, "%s%ld", data, maxv);
+                xasprintf (&data, "%s%" PRId64, data, maxv);
        return data;
 }
author	Lorenz <12514511+RincewindsHat@users.noreply.github.com>	2023-01-09 16:55:10 +0100
committer	GitHub <noreply@github.com>	2023-01-09 16:55:10 +0100
commit	e0ada6f11a82ed6119836482b84c8ba5df491d8f (patch)
tree	6ddcd5f7850169d82d88dca56a2e5c0dbda08b4e
parent	c389aa4f918aab5cf181aa2cb9dec68b3bf34d4f (diff)
parent	0899e41f5075d661153eb2c77ace1734a8f66bfa (diff)
download	monitoring-plugins-e0ada6f.tar.gz