23 files changed, 205 insertions, 224 deletions

diff --git a/.gitignore b/.gitignore
index 52ca6aa4..bda7b276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ NP-VERSION-FILE
 
 # /doc/
 /doc/developer-guidelines.html
+/doc/developer-guidelines.html.last
+/doc/jade-out.fot
 
 # /tap/
 /tap/.deps
diff --git a/ChangeLog b/ChangeLog
index 050d42bf..acc35759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-23  Robin Sonefors <robin.sonefors@op5.com>
+
+        * plugins/check_snmp.c: fix memory allocation if using >= 8 oids
+
 2012-06-27  Holger Weiss <holger@zedat.fu-berlin.de>
 
         * plugins/check_tcp.c: check_tcp: Print performance data even with
diff --git a/NEWS b/NEWS
index f2ca7e58..293bd9dc 100644
--- a/NEWS
+++ b/NEWS
@@ -3,10 +3,13 @@ This file documents the major additions and syntax changes between releases.
 ...
         ENHANCEMENTS
         New check_dbi plugin for checking an (SQL) database using DBI
+        Let OpenSSL load its configuration file (see the OPENSSL_config(3) man page)
+        Add performance data to check_procs
 
         FIXES
         Change the MAIL FROM command generated by check_smtp to be RFC compliant
         Fix compilation of check_http without SSL support
+        Fix check_snmp reversed threshold ranges (backward-compatibility)
 
 1.4.16 27th June 2012
         ENHANCEMENTS
diff --git a/THANKS.in b/THANKS.in
index 51935119..60f02cd4 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -275,3 +275,4 @@ Tobias Brox
 William Leibzon
 Jochen Bern
 Anders Kaseorg
+Robin Sonefors
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 1ce78ff4..e7754f4e 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -303,15 +303,15 @@
                                         </row>
                                         <row>
                                                 <entry>check_stuff -w~:0 -c10</entry>
-                                                <entry>Critical if "stuff" is above 10; Warn if "stuff" is above zero</entry>
+                                                <entry>Critical if "stuff" is above 10; Warn if "stuff" is above zero (will be critical if "stuff" is less than 0)</entry>
                                         </row>
                                         <row>
                                                 <entry>check_stuff -c5:6</entry>
-                                                <entry>The only noncritical range is 5:6</entry>
+                                                <entry>Critical if "stuff" is less than 5 or more than 6</entry>
                                         </row>
                                         <row>
-                                                <entry>check_stuff -c10:20</entry>
-                                                <entry>Critical if "stuff" is less than 10 or over 20</entry>
+                                                <entry>check_stuff -c@10:20</entry>
+                                                <entry>OK if stuff is less than 10 or higher than 20, otherwise critical </entry>
                                         </row>
                                 </tbody>
                         </tgroup>
diff --git a/doc/makefile b/doc/makefile
index b1b56c18..89caf9ed 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,4 +8,4 @@ developer-guidelines.html: developer-guidelines.sgml
         fi
 
 clean:
-        rm -f developer-guidelines.html
+        rm -f developer-guidelines.html developer-guidelines.html.last jade-out.fot
diff --git a/lib/utils_base.c b/lib/utils_base.c
index 1f705d97..c93e9c3c 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -35,7 +35,7 @@ nagios_plugin *this_nagios_plugin=NULL;
 
 void np_init( char *plugin_name, int argc, char **argv ) {
         if (this_nagios_plugin==NULL) {
-                this_nagios_plugin = malloc(sizeof(nagios_plugin));
+                this_nagios_plugin = calloc(1, sizeof(nagios_plugin));
                 if (this_nagios_plugin==NULL) {
                         die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                             strerror(errno));
@@ -108,7 +108,7 @@ range
         double end;
         char *end_str;
 
-        temp_range = (range *) malloc(sizeof(range));
+        temp_range = (range *) calloc(1, sizeof(range));
 
         /* Set defaults */
         temp_range->start = 0;
@@ -154,7 +154,7 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
 {
         thresholds *temp_thresholds = NULL;
 
-        if ((temp_thresholds = malloc(sizeof(thresholds))) == NULL)
+        if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL)
                 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                     strerror(errno));
 
@@ -335,13 +335,13 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
                                 if (tmp = index(varlist, sep)) {
                                         /* Value is delimited by a comma */
                                         if (tmp-varlist == 0) continue;
-                                        value = (char *)malloc(tmp-varlist+1);
+                                        value = (char *)calloc(1, tmp-varlist+1);
                                         strncpy(value, varlist, tmp-varlist);
                                         value[tmp-varlist] = '\0';
                                 } else {
                                         /* Value is delimited by a \0 */
                                         if (strlen(varlist) == 0) continue;
-                                        value = (char *)malloc(strlen(varlist) + 1);
+                                        value = (char *)calloc(1, strlen(varlist) + 1);
                                         strncpy(value, varlist, strlen(varlist));
                                         value[strlen(varlist)] = '\0';
                                 }
@@ -431,7 +431,7 @@ void np_enable_state(char *keyname, int expected_data_version) {
         if(this_nagios_plugin==NULL)
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
 
-        this_state = (state_key *) malloc(sizeof(state_key));
+        this_state = (state_key *) calloc(1, sizeof(state_key));
         if(this_state==NULL)
                 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                     strerror(errno));
@@ -482,7 +482,7 @@ state_data *np_state_read() {
         statefile = fopen( this_nagios_plugin->state->_filename, "r" );
         if(statefile!=NULL) {
 
-                this_state_data = (state_data *) malloc(sizeof(state_data));
+                this_state_data = (state_data *) calloc(1, sizeof(state_data));
                 if(this_state_data==NULL)
                         die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                             strerror(errno));
@@ -517,7 +517,7 @@ int _np_state_read_file(FILE *f) {
         time(&current_time);
 
         /* Note: This introduces a limit of 1024 bytes in the string data */
-        line = (char *) malloc(1024);
+        line = (char *) calloc(1, 1024);
         if(line==NULL)
                 die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
                     strerror(errno));
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index 5fae6adb..4a07df89 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -23,7 +23,16 @@ support() {
 
 #
 # check_range takes a value and a range string, returning successfully if an
-# alert should be raised based on the range.
+# alert should be raised based on the range.  Range values are inclusive.
+# Values may be integers or floats.
+#
+# Example usage:
+#
+# Generating an exit code of 1:
+# check_range 5 2:8
+#
+# Generating an exit code of 0:
+# check_range 1 2:8
 #
 check_range() {
         local v range yes no err decimal start end cmp match
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 893e0a14..3c80cb72 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -54,6 +54,7 @@ char *record_type = "A";
 char *expected_address = NULL;
 char *dns_server = NULL;
 char *dig_args = "";
+char *query_transport = "";
 int verbose = FALSE;
 int server_port = DEFAULT_PORT;
 double warning_interval = UNDEFINED;
@@ -87,8 +88,8 @@ main (int argc, char **argv)
     usage_va(_("Could not parse arguments"));
 
   /* get the command to run */
-  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s",
-            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args);
+  xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s",
+            PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport);
 
   alarm (timeout_interval);
   gettimeofday (&tv, NULL);
@@ -199,6 +200,8 @@ process_arguments (int argc, char **argv)
     {"record_type", required_argument, 0, 'T'},
     {"expected_address", required_argument, 0, 'a'},
     {"port", required_argument, 0, 'p'},
+    {"use-ipv4", no_argument, 0, '4'},
+    {"use-ipv6", no_argument, 0, '6'},
     {0, 0, 0, 0}
   };
 
@@ -206,7 +209,7 @@ process_arguments (int argc, char **argv)
     return ERROR;
 
   while (1) {
-    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:", longopts, &option);
+    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
 
     if (c == -1 || c == EOF)
       break;
@@ -269,6 +272,12 @@ process_arguments (int argc, char **argv)
     case 'a':
       expected_address = optarg;
       break;
+    case '4':
+      query_transport = "-4";
+      break;
+    case '6':
+      query_transport = "-6";
+      break;
     default:                  /* usage5 */
       usage5();
     }
@@ -325,6 +334,10 @@ print_help (void)
 
   printf (UT_HOST_PORT, 'p', myport);
 
+  printf (" %s\n","-4, --use-ipv4");
+  printf ("    %s\n",_("Force dig to only use IPv4 query transport"));
+  printf (" %s\n","-6, --use-ipv6");
+  printf ("    %s\n",_("Force dig to only use IPv6 query transport"));
   printf (" %s\n","-l, --query_address=STRING");
   printf ("    %s\n",_("Machine name to lookup"));
   printf (" %s\n","-T, --record_type=STRING");
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 65db8517..b05aca9a 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -445,11 +445,6 @@ print_help (void)
         printf (UT_SUPPORT);
 }
 
-/* todo
-* add option -4 and -6 to the long manual
-*
-*/
-
 void
 print_usage (void)
 {
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 76d19ba3..16be7c51 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -398,7 +398,11 @@ double offset_request(const char *host, int *status){
                         die(STATE_UNKNOWN, "can not create new socket");
                 }
                 if(connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)){
-                        die(STATE_UNKNOWN, "can't create socket connection");
+                        /* don't die here, because it is enough if there is one server
+                           answering in time. This also would break for dual ipv4/6 stacked
+                           ntp servers when the client only supports on of them.
+                         */
+                        DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
                 } else {
                         ufds[i].fd=socklist[i];
                         ufds[i].events=POLLIN;
@@ -845,6 +849,7 @@ void print_help(void){
         printf (UT_HELP_VRSN);
         printf (UT_EXTRA_OPTS);
         printf (UT_HOST_PORT, 'p', "123");
+        printf (UT_IPv46);
         printf (" %s\n", "-w, --warning=THRESHOLD");
         printf ("    %s\n", _("Offset to result in warning status (seconds)"));
         printf (" %s\n", "-c, --critical=THRESHOLD");
@@ -881,5 +886,5 @@ print_usage(void)
         printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
         printf ("%s\n\n", _("check_ntp_time instead."));
         printf ("%s\n", _("Usage:"));
-        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
+        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-4|-6] [-v verbose]\n", progname);
 }
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 50cb7b19..b59c056d 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -660,6 +660,7 @@ void print_help(void){
         print_usage();
         printf (UT_HELP_VRSN);
         printf (UT_EXTRA_OPTS);
+        printf (UT_IPv46);
         printf (UT_HOST_PORT, 'p', "123");
         printf (" %s\n", "-q, --quiet");
         printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
@@ -716,6 +717,6 @@ void
 print_usage(void)
 {
         printf ("%s\n", _("Usage:"));
-        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
+        printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
         printf("       [-j <warn>] [-k <crit>] [-v verbose]\n");
 }
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index d543d6b5..bbcaa0ba 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -344,7 +344,11 @@ double offset_request(const char *host, int *status){
                         die(STATE_UNKNOWN, "can not create new socket");
                 }
                 if(connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)){
-                        die(STATE_UNKNOWN, "can't create socket connection");
+                        /* don't die here, because it is enough if there is one server
+                           answering in time. This also would break for dual ipv4/6 stacked
+                           ntp servers when the client only supports on of them.
+                         */
+                        DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
                 } else {
                         ufds[i].fd=socklist[i];
                         ufds[i].events=POLLIN;
@@ -602,6 +606,7 @@ void print_help(void){
         print_usage();
         printf (UT_HELP_VRSN);
         printf (UT_EXTRA_OPTS);
+        printf (UT_IPv46);
         printf (UT_HOST_PORT, 'p', "123");
         printf (" %s\n", "-q, --quiet");
         printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
@@ -635,6 +640,6 @@ void
 print_usage(void)
 {
         printf ("%s\n", _("Usage:"));
-        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
+        printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
 }
 
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 69edae75..8b0769f1 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -475,6 +475,6 @@ void
 print_usage (void)
 {
         printf ("%s\n", _("Usage:"));
-        printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
+        printf ("%s [-H <host>] [-4|-6] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
         printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n");
 }
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 2f2dcc58..00b032a7 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -45,15 +45,13 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 
 int process_arguments (int, char **);
 int validate_arguments (void);
-int check_thresholds (int);
 int convert_to_seconds (char *); 
 void print_help (void);
 void print_usage (void);
 
-int wmax = -1;
-int cmax = -1;
-int wmin = -1;
-int cmin = -1;
+char *warning_range = NULL;
+char *critical_range = NULL;
+thresholds *procs_thresholds = NULL;
 
 int options = 0; /* bitmask of filter criteria to test against */
 #define ALL 1
@@ -238,14 +236,14 @@ main (int argc, char **argv)
                         }
 
                         if (metric == METRIC_VSZ)
-                                i = check_thresholds (procvsz);
+                                i = get_status ((double)procvsz, procs_thresholds);
                         else if (metric == METRIC_RSS)
-                                i = check_thresholds (procrss);
+                                i = get_status ((double)procrss, procs_thresholds);
                         /* TODO? float thresholds for --metric=CPU */
                         else if (metric == METRIC_CPU)
-                                i = check_thresholds ((int)procpcpu); 
+                                i = get_status (procpcpu, procs_thresholds);
                         else if (metric == METRIC_ELAPSED)
-                                i = check_thresholds (procseconds);
+                                i = get_status ((double)procseconds, procs_thresholds);
 
                         if (metric != METRIC_PROCS) {
                                 if (i == STATE_WARNING) {
@@ -276,7 +274,7 @@ main (int argc, char **argv)
 
         /* Needed if procs found, but none match filter */
         if ( metric == METRIC_PROCS ) {
-                result = max_state (result, check_thresholds (procs) );
+                result = max_state (result, get_status ((double)procs, procs_thresholds) );
         }
 
         if ( result == STATE_OK ) {
@@ -301,6 +299,13 @@ main (int argc, char **argv)
         if ( verbose >= 1 && strcmp(fails,"") )
                 printf (" [%s]", fails);
 
+        if (metric == METRIC_PROCS)
+                printf (" | procs=%d;%s;%s;0;", procs,
+                                warning_range ? warning_range : "",
+                                critical_range ? critical_range : "");
+        else
+                printf (" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit);
+
         printf ("\n");
         return result;
 }
@@ -368,28 +373,10 @@ process_arguments (int argc, char **argv)
                                 timeout_interval = atoi (optarg);
                         break;
                 case 'c':                                                                       /* critical threshold */
-                        if (is_integer (optarg))
-                                cmax = atoi (optarg);
-                        else if (sscanf (optarg, ":%d", &cmax) == 1)
-                                break;
-                        else if (sscanf (optarg, "%d:%d", &cmin, &cmax) == 2)
-                                break;
-                        else if (sscanf (optarg, "%d:", &cmin) == 1)
-                                break;
-                        else
-                                usage4 (_("Critical Process Count must be an integer!"));
+                        critical_range = optarg;
                         break;                                                   
                 case 'w':                                                                       /* warning threshold */
-                        if (is_integer (optarg))
-                                wmax = atoi (optarg);
-                        else if (sscanf (optarg, ":%d", &wmax) == 1)
-                                break;
-                        else if (sscanf (optarg, "%d:%d", &wmin, &wmax) == 2)
-                                break;
-                        else if (sscanf (optarg, "%d:", &wmin) == 1)
-                                break;
-                        else
-                                usage4 (_("Warning Process Count must be an integer!"));
+                        warning_range = optarg;
                         break;
                 case 'p':                                                                       /* process id */
                         if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
@@ -518,16 +505,19 @@ process_arguments (int argc, char **argv)
         }
 
         c = optind;
-        if (wmax == -1 && argv[c])
-                wmax = atoi (argv[c++]);
-        if (cmax == -1 && argv[c])
-                cmax = atoi (argv[c++]);
+        if ((! warning_range) && argv[c])
+                warning_range = argv[c++];
+        if ((! critical_range) && argv[c])
+                critical_range = argv[c++];
         if (statopts == NULL && argv[c]) {
                 xasprintf (&statopts, "%s", argv[c++]);
                 xasprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts);
                 options |= STAT;
         }
 
+        /* this will abort in case of invalid ranges */
+        set_thresholds (&procs_thresholds, warning_range, critical_range);
+
         return validate_arguments ();
 }
 
@@ -536,27 +526,6 @@ process_arguments (int argc, char **argv)
 int
 validate_arguments ()
 {
-
-        if (wmax >= 0 && wmin == -1)
-                wmin = 0;
-        if (cmax >= 0 && cmin == -1)
-                cmin = 0;
-        if (wmax >= wmin && cmax >= cmin) {     /* standard ranges */
-                if (wmax > cmax && cmax != -1) {
-                        printf (_("wmax (%d) cannot be greater than cmax (%d)\n"), wmax, cmax);
-                        return ERROR;
-                }
-                if (cmin > wmin && wmin != -1) {
-                        printf (_("wmin (%d) cannot be less than cmin (%d)\n"), wmin, cmin);
-                        return ERROR;
-                }
-        }
-
-/*      if (wmax == -1 && cmax == -1 && wmin == -1 && cmin == -1) { */
-/*              printf ("At least one threshold must be set\n"); */
-/*              return ERROR; */
-/*      } */
-
         if (options == 0)
                 options = ALL;
 
@@ -579,40 +548,6 @@ validate_arguments ()
 }
 
 
-
-/* Check thresholds against value */
-int
-check_thresholds (int value)
-{
-        if (wmax == -1 && cmax == -1 && wmin == -1 && cmin == -1) {
-                return OK;
-        }
-        else if (cmax >= 0 && cmin >= 0 && cmax < cmin) {
-                if (value > cmax && value < cmin)
-                        return STATE_CRITICAL;
-        }
-        else if (cmax >= 0 && value > cmax) {
-                return STATE_CRITICAL;
-        }
-        else if (cmin >= 0 && value < cmin) {
-                return STATE_CRITICAL;
-        }
-
-        if (wmax >= 0 && wmin >= 0 && wmax < wmin) {
-                if (value > wmax && value < wmin) {
-                        return STATE_WARNING;
-                }
-        }
-        else if (wmax >= 0 && value > wmax) {
-                return STATE_WARNING;
-        }
-        else if (wmin >= 0 && value < wmin) {
-                return STATE_WARNING;
-        }
-        return STATE_OK;
-}
-
-
 /* convert the elapsed time to seconds */
 int
 convert_to_seconds(char *etime) {
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 2d9861bc..7c5d0ec5 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -144,6 +144,25 @@ double previous_value[MAX_OIDS];
 int perf_labels = 1;
 
 
+static char *fix_snmp_range(char *th)
+{
+        double left, right;
+        char *colon, *ret;
+        if (!(colon = strchr(th, ':')))
+                return th;
+        *colon = 0;
+
+        left = strtod(th, NULL);
+        right = strtod(colon + 1, NULL);
+        if (right >= left) {
+                return th;
+        }
+        ret = malloc(strlen(th) + strlen(colon + 1) + 2);
+        sprintf(ret, "@%s:%s", colon + 1, th);
+        free(th);
+        return ret;
+}
+
 int
 main (int argc, char **argv)
 {
@@ -181,8 +200,8 @@ main (int argc, char **argv)
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
 
-        labels = malloc (labels_size);
-        unitv = malloc (unitv_size);
+        labels = malloc (labels_size * sizeof(*labels));
+        unitv = malloc (unitv_size * sizeof(*unitv));
         for (i = 0; i < MAX_OIDS; i++)
                 eval_method[i] = CHECK_UNDEF;
 
@@ -228,6 +247,10 @@ main (int argc, char **argv)
         for (i=0; i<numoids; i++) {
                 char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
                 char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
+                /* translate "2:1" to "@1:2" for backwards compatibility */
+                w = w ? fix_snmp_range(w) : NULL;
+                c = c ? fix_snmp_range(c) : NULL;
+
                 /* Skip empty thresholds, while avoiding segfault */
                 set_thresholds(&thlds[i],
                                w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL,
@@ -396,7 +419,7 @@ main (int argc, char **argv)
                         show = strstr (response, "Timeticks: ");
                 }
                 else
-                        show = response;
+                        show = response + 3;
 
                 iresult = STATE_DEPENDENT;
 
@@ -405,7 +428,7 @@ main (int argc, char **argv)
                 if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
                         ptr = strpbrk (show, "0123456789");
                         if (ptr == NULL)
-                                die (STATE_UNKNOWN,_("No valid data returned"));
+                                die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
                         response_value[i] = strtod (ptr, NULL);
 
                         if(calculate_rate) {
@@ -745,9 +768,9 @@ process_arguments (int argc, char **argv)
                         break;
                 case 'l':                                                                       /* label */
                         nlabels++;
-                        if (nlabels >= labels_size) {
+                        if (nlabels > labels_size) {
                                 labels_size += 8;
-                                labels = realloc (labels, labels_size);
+                                labels = realloc (labels, labels_size * sizeof(*labels));
                                 if (labels == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                         }
@@ -757,13 +780,13 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 labels[nlabels - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nlabels >= labels_size) {
+                                nlabels++;
+                                if (nlabels > labels_size) {
                                         labels_size += 8;
-                                        labels = realloc (labels, labels_size);
+                                        labels = realloc (labels, labels_size * sizeof(*labels));
                                         if (labels == NULL)
                                                 die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                 }
-                                nlabels++;
                                 ptr = thisarg (ptr);
                                 if (ptr[0] == '\'')
                                         labels[nlabels - 1] = ptr + 1;
@@ -774,9 +797,9 @@ process_arguments (int argc, char **argv)
                 case 'u':                                                                       /* units */
                         units = optarg;
                         nunits++;
-                        if (nunits >= unitv_size) {
+                        if (nunits > unitv_size) {
                                 unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size);
+                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                 if (unitv == NULL)
                                         die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                         }
@@ -786,9 +809,9 @@ process_arguments (int argc, char **argv)
                         if (ptr[0] == '\'')
                                 unitv[nunits - 1] = ptr + 1;
                         while (ptr && (ptr = nextarg (ptr))) {
-                                if (nunits >= unitv_size) {
+                                if (nunits > unitv_size) {
                                         unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size);
+                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
                                         if (units == NULL)
                                                 die (STATE_UNKNOWN, _("Could not realloc() units\n"));
                                 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 4d633949..6e8a5fc5 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -307,6 +307,6 @@ void
 print_usage (void)
 {
   printf ("%s\n", _("Usage:"));
-        printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
+        printf ("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
 }
 
diff --git a/plugins/common.h b/plugins/common.h
index 09af7e7e..c0dc2f41 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -141,6 +141,7 @@
 #ifdef HAVE_GNUTLS_OPENSSL_H
 #  include <gnutls/openssl.h>
 #else
+#  define OPENSSL_LOAD_CONF /* See the OPENSSL_config(3) man page. */
 #  ifdef HAVE_SSL_H
 #    include <rsa.h>
 #    include <crypto.h>
diff --git a/plugins/t/check_dig.t b/plugins/t/check_dig.t
index 323859e8..1ab4b426 100644
--- a/plugins/t/check_dig.t
+++ b/plugins/t/check_dig.t
@@ -10,30 +10,30 @@ use NPTest;
 
 plan skip_all => "check_dig not compiled" unless (-x "check_dig");
 
-plan tests => 12;
+plan tests => 16;
 
 my $successOutput = '/DNS OK - [\.0-9]+ seconds? response time/';
 
-my $hostname_valid = getTestParameter( 
+my $hostname_valid = getTestParameter(
                         "NP_HOSTNAME_VALID",
                         "A valid (known to DNS) hostname",
-                        "nagios.com"
+                        "nagiosplugins.org"
                         );
 
 my $hostname_valid_ip = getTestParameter(
                         "NP_HOSTNAME_VALID_IP",
                         "The IP address of the valid hostname $hostname_valid",
-                        "66.118.156.50",
+                        "67.207.143.200",
                         );
 
 my $hostname_valid_reverse = getTestParameter(
                         "NP_HOSTNAME_VALID_REVERSE",
                         "The hostname of $hostname_valid_ip",
-                        "66-118-156-50.static.sagonet.net.",
+                        "nagiosplugins.org.",
                         );
 
-my $hostname_invalid = getTestParameter( 
-                        "NP_HOSTNAME_INVALID", 
+my $hostname_invalid = getTestParameter(
+                        "NP_HOSTNAME_INVALID",
                         "An invalid (not known to DNS) hostname",
                         "nosuchhost.altinity.com",
                         );
@@ -69,6 +69,14 @@ SKIP: {
         cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
         like  ( $res->output, $successOutput, "Output OK" );
 
+        $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid  -t 5 -4");
+        cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
+        like  ( $res->output, $successOutput, "Output OK for IPv4" );
+
+        $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid  -t 5 -6");
+        cmp_ok( $res->return_code, '==', 0, "Found $hostname_valid on $dns_server");
+        like  ( $res->output, $successOutput, "Output OK for IPv6" );
+
         $res = NPTest->testCmd("./check_dig -H $dns_server -l $hostname_valid -a $hostname_valid_ip -t 5");
         cmp_ok( $res->return_code, '==', 0, "Got expected address");
 
diff --git a/tools/np_build_from_sf b/tools/np_build_from_sf
new file mode 100755
index 00000000..7ba349a6
--- /dev/null
+++ b/tools/np_build_from_sf
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -xeu
+
+temp=$(mktemp -d)
+trap "cd $HOME; rm -rf $temp; exit 1" EXIT
+curl -sS http://nagiosplug.sourceforge.net/snapshot/nagios-plugins-HEAD.tar.gz|tar -C "$temp" --strip-components=1 -xzf -
+cd $temp
+./configure && make
+$HOME/bin/update_man_pages
+
diff --git a/tools/sfwebcron b/tools/sfwebcron
index d836a0fd..0f31fcfb 100755
--- a/tools/sfwebcron
+++ b/tools/sfwebcron
@@ -4,32 +4,32 @@
 # To update the developers-guidelines.html and put in html area
 #
 # Install in cron with something like:
-#  47 7 * * * $HOME/bin/sfwebcron
+#  47 7 * * * $HOME/bin/sfwebcron >/tmp/sfwebcron.log 2>&1 || cat /tmp/sfwebcron.log
 
-function die { echo $1; exit 1; }
+set -eu
+trap 'echo "Command failed at line $LINENO"' ERR
 
 # Set working variables
 PROJECT=nagiosplug
-IN=${HOME}/tmp_sfwebcron
-OUT_SERVER="tonvoon@shell.sf.net"
-OUT="/home/groups/n/na/nagiosplug/htdocs"
-
-if [[ ! -e developer-guidelines.html.last ]] ; then
-        touch developer-guidelines.html.last
-fi
+IN=${HOME}/sfwebcron
+PROBE="developer-guidelines.html.last"
+OUT_SERVER="tonvoon@frs.sourceforge.net"
+OUT_PATH="/home/groups/n/na/nagiosplug/htdocs"
 
 # Get latest dev guildelines
 [[ ! -d $IN ]] && mkdir $IN
 cd $IN
-if [[ ! -d doc ]] ; then
-        #cvs -z3 -d:pserver:anonymous@cvs1:/cvsroot/nagiosplug co nagiosplug || die "Cannot cvs"
-        svn checkout http://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk/doc doc
+if [[ ! -d nagios-plugins ]]
+then
+        git clone https://github.com/nagios-plugins/nagios-plugins.git nagios-plugins
 fi
-cd doc
-svn update
+cd nagios-plugins/doc
+git pull
 
 make
-if [[ developer-guidelines.html -nt developer-guidelines.html.last ]] ; then
-        scp developer-guidelines.{html,sgml} $OUT_SERVER:$OUT
-        touch developer-guidelines.html.last
+if [[ ! -e $PROBE || developer-guidelines.html -nt $PROBE ]]
+then
+        rsync -av developer-guidelines.{html,sgml} $OUT_SERVER:$OUT_PATH/
+        touch $PROBE
 fi
+
diff --git a/tools/snapshot b/tools/snapshot
deleted file mode 100755
index 9fa61cfe..00000000
--- a/tools/snapshot
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-
-# This scipt assumes that you have anonCVS for nagios and nagiosplug
-# in ${IN}
-
-# cvs -d:pserver:anonymous@cvs.nagiosplug.sourceforge.net:/cvsroot/nagiosplug login
-# cvs -z3 -d:pserver:anonymous@cvs.nagiosplug.sourceforge.net:/cvsroot/nagiosplug co nagiosplug
-#
-# cvs -d:pserver:anonymous@cvs.nagios.sourceforge.net:/cvsroot/nagios login
-# cvs -z3 -d:pserver:anonymous@cvs.nagios.sourceforge.net:/cvsroot/nagios co nagios
-
-# Set directories
-IN=${HOME}/sf
-OUT=/col/htdocs/src/nagios
-RPM_TOPDIR=${HOME}/redhat
-
-# Update nagiosplug CVS
-cd ${IN}/nagiosplug
-rm configure configure.in Makefile.in
-cvs update
-DS=`date -u +%Y%m%d%H%M`
-sed "s/^VER=.*/VER=${DS}/;s/^REL=.*/REL=snapshot/" configure.in > configure.tmp
-mv configure.tmp configure.in
-aclocal
-autoheader
-autoconf
-automake
-autoreconf
-
-# Make the Nagiosplug dist tarball
-rm -r build-dist
-mkdir build-dist
-cd build-dist
-../configure
-make dist
-cp -fv *.gz ${OUT}
-
-# Make the Nagiosplug custom RPM
-echo "%_topdir ${RPM_TOPDIR}" > ./.rpmrc
-mkdir -p ${RPM_TOPDIR}/RPMS/i386 ${RPM_TOPDIR}/SRPMS ${RPM_TOPDIR}/SOURCES ${RPM_TOPDIR}/BUILD ${RPM_TOPDIR}/SPECS
-rpm --rcfile "/usr/lib/rpm/rpmrc:${IN}/rpmrc" --define 'custom 1' -ta *.gz
-cp -fv ~/redhat/RPMS/i386/nagios-plugins-custom-*.i386.rpm /col/htdocs/src/nagios
-
-# Copy the new snapshot and delete the old ones
-cd ${OUT}
-GLOBIGNORE=nagios-plugins-${DS}-snapshot.tar.gz
-rm -f nagios-plugins-*.tar.gz
-GLOBIGNORE=nagios-plugins-custom-${DS}-snapshot.i386.rpm
-rm -f nagios-plugins-custom-*-snapshot.i386.rpm
-cd ~/redhat/SRPMS
-rm nagios-plugins-custom-${DS}-snapshot.src.rpm
-cd ~/redhat/RPMS/i386
-rm nagios-plugins-custom-${DS}-snapshot.i386.rpm
-
-# Update Nagios CVS
-cd ${IN}/sf/nagios
-rm configure configure.in nagios.spec base/nagios.c common/common.h \
-        html/main.html Makefile.in
-cvs update
-
-# Make the Nagios tarball
-DS=`date -u +%Y%m%d%H%M`
-./make-tarball ${DS}
-
-# Copy the new snapshot and delete the old ones
-mv ../nagios-${DS}.tar.gz /col/htdocs/src/nagios/
-GLOBIGNORE=${OUT}/nagios-${DS}.tar.gz
-rm ${OUT}/nagios-20*.tar.gz
-
diff --git a/tools/update_man_pages b/tools/update_man_pages
new file mode 100755
index 00000000..5c4a901e
--- /dev/null
+++ b/tools/update_man_pages
@@ -0,0 +1,34 @@
+#!/usr/bin/perl
+use strict;
+use DBI;
+#$ENV{PERL5LIB}="plugins-scripts"; # Needed for utils.pm
+
+unless ($ENV{DRUPAL_PASSWORD}) {
+        die "Must set envvar for DRUPAL_PASSWORD";
+}
+
+my $dbh = DBI->connect("DBI:mysql:database=www;host=127.0.0.1", "www", $ENV{DRUPAL_PASSWORD});
+
+my @plugin_paths;
+push @plugin_paths, (grep { -x $_ && -f $_ } (<plugins-root/*>, <plugins/*>) );
+
+foreach my $plugin_path (@plugin_paths) {
+        my $plugin = $plugin_path;
+        $plugin =~ s%.*/%%;
+        my $help_option = "--help";
+        $help_option = "-h" if ($plugin eq "check_icmp");
+        my $help = `$plugin_path $help_option` || die "Cannot run $plugin -h";
+        $help =~ s/</&lt;/g;
+        $help =~ s/>/&gt;/g;
+
+        my $rows = $dbh->do("UPDATE node SET created=UNIX_TIMESTAMP(NOW()) WHERE title='$plugin'");
+        unless ($rows == 1) {
+                die "Cannot find $plugin in drupal to update - create book page first";
+        }
+
+        $dbh->do("UPDATE node_revisions SET timestamp=UNIX_TIMESTAMP(NOW()), log='Updated by update_online_manpage', teaser='$plugin --help',  body=? WHERE title='$plugin'",
+                {},
+                "<pre>".$help."</pre>");
+}
+
+print "Finished\n";