6 files changed, 94 insertions, 181 deletions

diff --git a/ROADMAP b/ROADMAP
deleted file mode 100644
index 6378ec74..00000000
--- a/ROADMAP
+++ /dev/null
@@ -1,117 +0,0 @@
-
-Releases in the 1.3 series will be for development. Version 1.4.0 will
-be the next full production release. I am not planning on dates right now, 
-but you can expect maintennence releases for 1.2.9 as well.
-
-With that done, it's time to figure out what we are doing for release 
-1.3 development. I have a few ideas. Maybe others do as well.
-
-DOCUMENTATION:
-  We pretty much have decided that we will doing something along 
-  the lines of a literate programming model. So far, we have site 
-  documentation in DocBook. I have some ideas here, which I will
-  discuss in a separate thread.
-
-
-
-OPTION PROCESSING:
-  I believe we can remove reverse compatibility for non-Getopt
-  option specifications. For example, 'check_ping 1 2 3 4 -p 2'
-  would not be supported anymore. Support for this is a hack, 
-  and making it portable is bug-prone. We should also review
-  standardization of our options -- the current list is a little
-  ad hoc, it should be nailed down. Details in a separate thread.
-
-Also, 
-
-  check_http -p 443 --ssl www.infoplease.com
-
-should be fine, but if the getopt in use does not natively support it,
-things like
-
-  check_http www.infoplease.com -p 443 --ssl
-
-should be trapped and result in a call to one of the usage macros
-(which print a message and then exit STATE_UNKNOWN).
-
-This means that the call_getopt() function can go away. It's an
-inconsistent mess and I'd love to ditch it. I only created it to
-satisfy people that wanted reverse compatibility and did not have
-GNU getopt.
-
-But I would like to urge that all standard plugins contain
-validate_arguments(). I think this will help convey the idea that
-validations should be done, even if we don't insist on the specific
-extent that each plugin must do that validation.
-
-This is the set of standard options I envision:
-
-Reserved:
-
--h, --help (REQUIRED!!!!!)
--V, --version (REQUIRED!!!!!)
--v, --verbose
--q, --quiet
--t, --timeout = INTEGER (senonds)
--c, --critical = (INT|FLOAT|RANGE|LIST) 
--w, --warning = (INT|FLOAT|RANGE|LIST)
--H, --hostname = STRING
--F, --file = STRING (usually input) 
--O, --output = STRING (output file) 
-
-Recommended, but not reserved: 
-
--I, --ipaddress = STRING
--C, --community = STRING
--a, --auth(info) = STRING (authentication or password) 
--l, --logname = STRING
--p, --password = STRING
--P, --port = INT
--u, --url = STRING (also --username if --url is not needed)
-
-I am suggesting that port always be '-P' (uppercase) -- we are
-currently inconsistent in that regard.
-
-I am also adding '-q' for silent running. This is totally self
-centered--I am planning to use a plugin in a cron script, and I
-don't want nightly emails.
-
-As has been the case, ranges are specified with colons, like 'i:j'
-and list are specified with commas like 'i,k' and may contain ranges
-if it makes sense to do so. Perhaps it would be good to build a
-standard list/range processing function for this task.
-
-
-Programming:
-  I would like to follow the GNU guidelines and remove all fixed
-  length character assignments, at least to the extent possible,
-  from the C-based plugins. To that end, I have made strscpy and
-  friends in utils.c -- I'd like to deploy them. I have comments 
-  that there is a lot of duplicated code, and techniques used that
-  should be cleaned up. Details in a separate thread.
-
-Remote checks:
-  I have a proposal in hand to incorporate ssh check into spopen()
-  so that remote machine checks can be seamless. A nice idea, but 
-  complex enough to require discussion. Another thread.
-
-I also have a wish list, and I'm sure I've forgot some items. I'll 
-list mine, please respond with other items that can be put into the 
-sourceforge task manager:
-
-  Indent all code in a GNU-compatible manner (indent -ts 2 -br)
-  Add RAND_seed to check_http for --ssl on systems without /dev/random
-  Add regex filtering to check_procs --args option
-  Add working procs syntax for AIX check_procs
-  Allow check_disk to exclude non-local disks
-  Add md5 checksumming to check_http
-  Complete unification of check_tcp and friends
-  Add SSL in a general way to check_tcp and friends
-  Patches to check_log from Joonas
-  Add calculator engine and snmpwalk to check_snmp
-  Is there a bug in check_oracle
-  Are there outstanding bugs in check_snmp
-  Change check_http --onredirect to default as STATE_UNKNOWN
-  Create plugin to check tftp servers
-  Create plugin wrapper to invert error status
-
diff --git a/configure.ac b/configure.ac
index ef3d26e2..204fc6e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1460,23 +1460,30 @@ AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
                             [Path to snmpget command]),
             PATH_TO_SNMPGET=$withval)
-if test -n "$PATH_TO_SNMPGET"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
-        EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
-else
-        AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins])
-fi
 
 AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
 AC_ARG_WITH(snmpgetnext_command,
             ACX_HELP_STRING([--with-snmpgetnext-command=PATH],
                             [Path to snmpgetnext command]),
             PATH_TO_SNMPGETNEXT=$withval)
-if test -n "$PATH_TO_SNMPGETNEXT"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
-fi
+
+AS_IF([test -n "$PATH_TO_SNMPGET"], [
+        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
+        EXTRAS="$EXTRAS check_hpjd"
+
+        dnl PATH_TO_SNMPGETNEXT is used unconditionally in check_snmp:
+        dnl
+        dnl   https://github.com/nagios-plugins/nagios-plugins/issues/788
+        dnl
+        AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
+                AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
+                EXTRAS="$EXTRAS check_snmp\$(EXEEXT)"
+        ], [
+                AC_MSG_WARN([Get snmpgetnext from https://net-snmp.sourceforge.io/ to build the check_snmp plugin])
+        ])
+], [
+        AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to build the check_hpjd and check_snmp plugins])
+])
 
 if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
 then
diff --git a/opttest.pl b/opttest.pl
deleted file mode 100755
index 85e3b494..00000000
--- a/opttest.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use Test;
-
-use vars qw($dir $file $prog $idx $state $output %progs @dirs);
-
-my $tests = 0;
-
-@dirs = qw(plugins plugins-scripts);
-
-foreach $dir (@dirs) {
-        opendir(DIR, $dir) || die "can't opendir $dir: $!";
-        while ($file = readdir(DIR)) {
-                if (-x "$dir/$file" && -f "$dir/$file") {
-                        $tests++;
-                        $progs{"$dir/$file"} = $file;
-                }
-        }
-        closedir DIR;
-}
-
-plan tests => $tests;
-
-for $prog (keys %progs) {
-        $state = 0;
-        $file = `basename $prog`;
-
-        $idx = 1;
-        $output = `$prog -h 2>&1`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-        unless ($output =~ m/$progs{$prog}/ms) {
-                $idx++; $state++;print "$output\n$prog failed test $idx\n";
-        }
-
-        $idx++;
-        `$prog --help 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        $idx++;
-                `$prog -V 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        $idx++;
-        `$prog --version 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        print "$prog ($idx tests) ";
-        ok $state,0;
-}
-
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 866e0e0f..ba3581b1 100755..100644
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -20,7 +20,6 @@ print_help() {
         echo "This plugin checks hardware status using the lm_sensors package."
         echo ""
         support
-        exit "$STATE_OK"
 }
 
 case "$1" in
diff --git a/plugins/negate.c b/plugins/negate.c
index 7e52fe67..750c0bfb 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -133,11 +133,11 @@ static const char **process_arguments(int argc, char **argv) {
                         break;
                 case 'h': /* help */
                         print_help();
-                        exit(EXIT_SUCCESS);
+                        exit(STATE_UNKNOWN);
                         break;
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
-                        exit(EXIT_SUCCESS);
+                        exit(STATE_UNKNOWN);
                 case 't': /* timeout period */
                         if (!is_integer(optarg))
                                 usage2(_("Timeout interval must be a positive integer"), optarg);
diff --git a/tools/opttest.pl b/tools/opttest.pl
new file mode 100755
index 00000000..98213082
--- /dev/null
+++ b/tools/opttest.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl -w
+use strict;
+use warnings;
+use Test;
+
+# This script (when executed from the monitoring plugins top level directory)
+# executes all the plugins with -h, --help, -V and --version to verify that
+# all of them exit properly with the state UNKNOWN (3)
+
+use vars qw($dir $file $prog $idx $state $output %progs @dirs);
+
+my $tests = 0;
+
+@dirs = qw(plugins plugins-scripts);
+
+foreach my $dir (@dirs) {
+        opendir(DIR, $dir) || die "can't opendir $dir: $!";
+        while ($file = readdir(DIR)) {
+                if (-x "$dir/$file" && -f "$dir/$file") {
+                        $tests++;
+                        $progs{"$dir/$file"} = $file;
+                }
+        }
+        closedir DIR;
+}
+
+plan tests => $tests;
+
+for my $prog (keys %progs) {
+        $state = 0;
+        $file = `basename $prog`;
+
+        $idx = 1;
+        $output = `$prog -h 2>&1`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (short form))\n";
+                exit(1);
+        }
+
+        unless ($output =~ m/$progs{$prog}/ms) {
+                $idx++;
+                $state++;
+                print "$output\n$prog failed test $idx\n";
+        }
+
+        $idx++;
+        `$prog --help 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (long form))\n";
+                exit(1);
+        }
+
+        $idx++;
+        `$prog -V 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (short form))\n";
+                exit(1);
+        }
+
+        $idx++;
+        `$prog --version 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (long form))\n";
+                exit(1);
+        }
+
+        print "$prog ($idx tests) ";
+        ok $state,0;
+}
+