From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 30 Sep 2013 00:03:24 +0200
Subject: Import Nagios Plugins site

Import the Nagios Plugins web site, Cronjobs, infrastructure scripts,
and configuration files.
---
 web/attachments/230229-nagios-checkdns.patch | 86 ++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 web/attachments/230229-nagios-checkdns.patch

(limited to 'web/attachments/230229-nagios-checkdns.patch')

diff --git a/web/attachments/230229-nagios-checkdns.patch b/web/attachments/230229-nagios-checkdns.patch
new file mode 100644
index 0000000..591cbf8
--- /dev/null
+++ b/web/attachments/230229-nagios-checkdns.patch
@@ -0,0 +1,86 @@
+diff -ru nagios-plugins-HEAD-200705220000/plugins/check_dns.c nagios-plugins/plugins/check_dns.c
+--- nagios-plugins-HEAD-200705220000/plugins/check_dns.c	2007-01-28 22:46:40.000000000 +0100
++++ nagios-plugins/plugins/check_dns.c	2007-05-23 12:06:06.000000000 +0200
+@@ -62,12 +62,24 @@
+ int expect_authority = FALSE;
+ thresholds *time_thresholds = NULL;
+ 
++static int
++qstrcmp(const void *p1, const void *p2)
++{
++	/* The actual arguments to this function are "pointers to
++	   pointers to char", but strcmp() arguments are "pointers
++	   to char", hence the following cast plus dereference */
++	return strcmp(* (char * const *) p1, * (char * const *) p2);
++}
++
++
+ int
+ main (int argc, char **argv)
+ {
+   char *command_line = NULL;
+   char input_buffer[MAX_INPUT_BUFFER];
+   char *address = NULL;
++  char **addresses = NULL;
++  int n_addresses = 0;
+   char *msg = NULL;
+   char *temp_buffer = NULL;
+   int non_authoritative = FALSE;
+@@ -141,16 +153,17 @@
+              NSLOOKUP_COMMAND);
+       }
+ 
+-      if (address == NULL)
+-        address = strdup (temp_buffer);
+-      else
+-        asprintf(&address, "%s,%s", address, temp_buffer);
++      if (addresses == NULL) 
++	addresses = malloc(sizeof(*addresses)*10);
++      else if (!(n_addresses % 10))
++	addresses = realloc(addresses,sizeof(*addresses) * (n_addresses + 10));
++      addresses[n_addresses++] = strdup(temp_buffer);
+     }
+-
+     else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
+       non_authoritative = TRUE;
+     }
+ 
++
+     result = error_scan (chld_out.line[i]);
+     if (result != STATE_OK) {
+       msg = strchr (chld_out.line[i], ':');
+@@ -171,9 +184,21 @@
+     }
+   }
+ 
+-  /* If we got here, we should have an address string,
+-   * and we can segfault if we do not */
+-  if (address==NULL || strlen(address)==0)
++  if (addresses) {
++    int i,slen;
++    char *adrp;
++    qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
++    for(i=0, slen=1; i < n_addresses; i++) {
++      slen += strlen(addresses[i])+1;
++    }
++    adrp = address = malloc(slen);
++    for(i=0; i < n_addresses; i++) {
++      if (i) *adrp++ = ',';
++      strcpy(adrp, addresses[i]);
++      adrp += strlen(addresses[i]);
++    }
++    *adrp = 0;
++  } else
+     die (STATE_CRITICAL,
+          _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
+          NSLOOKUP_COMMAND);
+@@ -428,7 +453,8 @@
+   printf (" -s, --server=HOST\n");
+   printf ("    %s\n", _("Optional DNS server you want to use for the lookup"));
+   printf (" -a, --expected-address=IP-ADDRESS|HOST\n");
+-  printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with ."));
++  printf ("    %s\n", _("Optional IP-ADDRESS you expect the DNS server to return. HOST must end with .\n\
++Multiple addresses can be separated with commas, and need to be sorted."));
+   printf (" -A, --expect-authority\n");
+   printf ("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
+   printf (" -w, --warning=seconds\n");
-- 
cgit v1.2.3-74-g34f1