SOURCES: nagios-plugins-misc_typos.patch (NEW), nagios-plugins-che...
glen
glen at pld-linux.org
Mon Apr 28 23:58:46 CEST 2008
Author: glen Date: Mon Apr 28 21:58:46 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- patches from debian (#nagios-plugins_1.4.11-2.diff.gz)
---- Files affected:
SOURCES:
nagios-plugins-misc_typos.patch (NONE -> 1.1) (NEW), nagios-plugins-check_ldap_pointer.patch (NONE -> 1.1) (NEW), nagios-plugins-check_disk_local_option.patch (NONE -> 1.1) (NEW), nagios-plugins-fix_check_ntp_options.patch (NONE -> 1.1) (NEW), nagios-plugins-check_ntp_fixsefault_deprecate.patch (NONE -> 1.1) (NEW), nagios-plugins-check_radius_segfault.patch (NONE -> 1.1) (NEW), nagios-plugins-implicit-basename.patch (NONE -> 1.1) (NEW), nagios-plugins-check_smb_hostaddress.patch (NONE -> 1.1) (NEW), nagios-plugins-check_game_cmdline.patch (NONE -> 1.1) (NEW), nagios-plugins-check_log_paths.patch (NONE -> 1.1) (NEW), nagios-plugins-checkircd.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/nagios-plugins-misc_typos.patch
diff -u /dev/null SOURCES/nagios-plugins-misc_typos.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-misc_typos.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,232 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_misc_typos.dpatch by <andy at andrewprice.me.uk> modified for 1.4.10 by
+## Jan Wagner <waja at cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: This patch fixes various typos and grammatical errors in plugins/*.c.
+## DP: It is based on Malcolm Parsons' patch posted at https://launchpad.net/bugs/64595
+
+ at DPATCH@
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_dns.c nagios-plugins-1.4.10/plugins/check_dns.c
+--- nagios-plugins-1.4.10.orig/plugins/check_dns.c 2007-01-28 22:46:41.000000000 +0100
++++ nagios-plugins-1.4.10/plugins/check_dns.c 2007-12-06 14:17:22.000000000 +0100
+@@ -218,7 +218,7 @@
+ printf (_("DNS CRITICAL - %s\n"),
+ !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+ else
+- printf (_("DNS UNKNOW - %s\n"),
++ printf (_("DNS UNKNOWN - %s\n"),
+ !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
+
+ return result;
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_http.c nagios-plugins-1.4.10/plugins/check_http.c
+--- nagios-plugins-1.4.10.orig/plugins/check_http.c 2007-07-21 18:29:01.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_http.c 2007-12-06 14:18:47.000000000 +0100
+@@ -1089,7 +1089,7 @@
+
+ url = malloc (strcspn (pos, "\r\n"));
+ if (url == NULL)
+- die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n"));
++ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+
+ while (pos) {
+ sscanf (pos, "%[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]:%n", xx, &i);
+@@ -1120,7 +1120,7 @@
+
+ url = realloc (url, strcspn (pos, "\r\n") + 1);
+ if (url == NULL)
+- die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n"));
++ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+
+ /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+ if (sscanf (pos, HD1, type, addr, &i, url) == 4)
+@@ -1287,7 +1287,7 @@
+ printf (" %s\n", _("Connect via SSL. Port defaults to 443"));
+ printf (" %s\n", "-C, --certificate=INTEGER");
+ printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+- printf (" %s\n", _("(when this option is used the url is not checked.)\n"));
++ printf (" %s\n", _("(when this option is used the URL is not checked.)\n"));
+ #endif
+
+ printf (" %s\n", "-e, --expect=STRING");
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_ldap.c nagios-plugins-1.4.10/plugins/check_ldap.c
+--- nagios-plugins-1.4.10.orig/plugins/check_ldap.c 2007-07-08 00:20:40.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_ldap.c 2007-12-06 14:19:23.000000000 +0100
+@@ -191,7 +191,7 @@
+ LDAP_SUCCESS) {
+ if (verbose)
+ ldap_perror(ld, "ldap_bind");
+- printf (_("Could not bind to the ldap-server\n"));
++ printf (_("Could not bind to the LDAP server\n"));
+ return STATE_CRITICAL;
+ }
+
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_mysql.c nagios-plugins-1.4.10/plugins/check_mysql.c
+--- nagios-plugins-1.4.10.orig/plugins/check_mysql.c 2007-03-29 19:58:28.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_mysql.c 2007-12-06 14:19:57.000000000 +0100
+@@ -370,7 +370,7 @@
+
+ printf (_(COPYRIGHT), copyright, email);
+
+- printf ("%s\n", _("This program tests connections to a mysql server"));
++ printf ("%s\n", _("This program tests connections to a MySQL server"));
+
+ printf ("\n\n");
+
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_procs.c nagios-plugins-1.4.10/plugins/check_procs.c
+--- nagios-plugins-1.4.10.orig/plugins/check_procs.c 2007-07-15 17:21:51.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_procs.c 2007-12-06 14:22:31.000000000 +0100
+@@ -690,7 +690,7 @@
+ printf (" %s\n", _("PROCS - number of processes (default)"));
+ printf (" %s\n", _("VSZ - virtual memory size"));
+ printf (" %s\n", _("RSS - resident set memory size"));
+- printf (" %s\n", _("CPU - percentage cpu"));
++ printf (" %s\n", _("CPU - percentage CPU"));
+ /* only linux etime is support currently */
+ #if defined( __linux__ )
+ printf (" %s\n", _("ELAPSED - time elapsed in seconds"));
+@@ -708,11 +708,11 @@
+ printf (" %s\n", "-p, --ppid=PPID");
+ printf (" %s\n", _("Only scan for children of the parent process ID indicated."));
+ printf (" %s\n", "-z, --vsz=VSZ");
+- printf (" %s\n", _("Only scan for processes with vsz higher than indicated."));
++ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated."));
+ printf (" %s\n", "-r, --rss=RSS");
+- printf (" %s\n", _("Only scan for processes with rss higher than indicated."));
++ printf (" %s\n", _("Only scan for processes with RSS higher than indicated."));
+ printf (" %s\n", "-P, --pcpu=PCPU");
+- printf (" %s\n", _("Only scan for processes with pcpu higher than indicated."));
++ printf (" %s\n", _("Only scan for processes with PCPU higher than indicated."));
+ printf (" %s\n", "-u, --user=USER");
+ printf (" %s\n", _("Only scan for processes with user name or ID indicated."));
+ printf (" %s\n", "-a, --argument-array=STRING");
+@@ -740,9 +740,9 @@
+ printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing"));
+ printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
+ printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
+- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
++ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
+ printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
+- printf (" %s\n\n", _("Alert if cpu of any processes over 10%% or 20%%"));
++ printf (" %s\n\n", _("Alert if CPU of any processes over 10%% or 20%%"));
+
+ printf (_(UT_SUPPORT));
+ }
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_radius.c nagios-plugins-1.4.10/plugins/check_radius.c
+--- nagios-plugins-1.4.10.orig/plugins/check_radius.c 2007-09-26 12:57:44.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_radius.c 2007-12-06 14:24:05.000000000 +0100
+@@ -311,7 +311,7 @@
+ printf ("Copyright (c) 1999 Robert August Vincent II\n");
+ printf (COPYRIGHT, copyright, email);
+
+- printf("%s\n", _("Tests to see if a radius server is accepting connections."));
++ printf("%s\n", _("Tests to see if a RADIUS server is accepting connections."));
+
+ printf ("\n\n");
+
+@@ -336,16 +336,16 @@
+
+ printf (_(UT_TIMEOUT), timeout_interval);
+
+- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections."));
++ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
+ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
+ printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
+ printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
+ printf ("%s\n", _("The password option presents a substantial security issue because the"));
+ printf ("%s\n", _("password can be determined by careful watching of the command line in"));
+ printf ("%s\n", _("a process listing. This risk is exacerbated because nagios will"));
+- printf ("%s\n", _("run the plugin at regular prdictable intervals. Please be sure that"));
++ printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that"));
+ printf ("%s\n", _("the password used does not allow access to sensitive system resources,"));
+- printf ("%s\n", _("otherwise compormise could occur."));
++ printf ("%s\n", _("otherwise compromise could occur."));
+
+ printf (_(UT_SUPPORT));
+ }
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_snmp.c nagios-plugins-1.4.10/plugins/check_snmp.c
+--- nagios-plugins-1.4.10.orig/plugins/check_snmp.c 2007-05-29 07:22:32.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_snmp.c 2007-12-06 14:25:18.000000000 +0100
+@@ -917,7 +917,7 @@
+
+ printf (COPYRIGHT, copyright, email);
+
+- printf ("%s\n", _("Check status of remote machines and obtain sustem information via SNMP"));
++ printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
+
+ printf ("\n\n");
+
+@@ -952,8 +952,8 @@
+ printf (" %s\n", "-o, --oid=OID(s)");
+ printf (" %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
+ printf (" %s\n", "-m, --miblist=STRING");
+- printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'"));
+- printf (" %s\n", _("for symbolic oids.)"));
++ printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
++ printf (" %s\n", _("for symbolic OIDs.)"));
+ printf (" %s\n", "-d, --delimiter=STRING");
+ printf (_(" Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER);
+ printf (" %s\n", _("Any data on the right hand side of the delimiter is considered"));
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_tcp.c nagios-plugins-1.4.10/plugins/check_tcp.c
+--- nagios-plugins-1.4.10.orig/plugins/check_tcp.c 2007-06-03 16:40:13.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_tcp.c 2007-12-06 14:25:56.000000000 +0100
+@@ -621,7 +621,7 @@
+ printf (" %s\n", "-q, --quit=STRING");
+ printf (" %s\n", _("String to send server to initiate a clean close of the connection"));
+ printf (" %s\n", "-r, --refuse=ok|warn|crit");
+- printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
++ printf (" %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
+ printf (" %s\n", "-M, --mismatch=ok|warn|crit");
+ printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
+ printf (" %s\n", "-j, --jail");
+diff -Nur nagios-plugins-1.4.10.orig/plugins/check_ups.c nagios-plugins-1.4.10/plugins/check_ups.c
+--- nagios-plugins-1.4.10.orig/plugins/check_ups.c 2007-05-09 11:16:33.000000000 +0200
++++ nagios-plugins-1.4.10/plugins/check_ups.c 2007-12-06 14:27:26.000000000 +0100
+@@ -416,7 +416,7 @@
+ len = strlen(ptr);
+ if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
+ if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
+- printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);
++ printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name);
+ return ERROR;
+ }
+
+@@ -583,7 +583,7 @@
+ validate_arguments (void)
+ {
+ if (! ups_name) {
+- printf ("%s\n", _("Error : no ups indicated"));
++ printf ("%s\n", _("Error : no UPS indicated"));
+ return ERROR;
+ }
+ return OK;
+@@ -635,7 +635,7 @@
+ printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
+ printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
+ printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
+- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL"));
++ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
+ printf ("%s\n\n", _("state."));
+
+ printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,"));
+@@ -643,7 +643,7 @@
+ printf ("%s\n", _("that variable. If the remote host has multiple UPS that are being monitored you"));
+ printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check."));
+
+- printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's"));
++ printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
+ printf ("%s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the"));
+ printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org"));
+
+diff -Nur nagios-plugins-1.4.10.orig/plugins-scripts/check_mailq.pl nagios-plugins-1.4.10/plugins-scripts/check_mailq.pl
+--- nagios-plugins-1.4.10.orig/plugins-scripts/check_mailq.pl 2006-07-05 15:45:57.000000000 +0200
++++ nagios-plugins-1.4.10/plugins-scripts/check_mailq.pl 2007-12-10 01:18:51.803913108 +0100
+@@ -588,7 +588,7 @@
+ print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
+ print " Feedback/patches to support non-sendmail mailqueue welcome\n\n";
+ print "-w (--warning) = Min. number of messages in queue to generate warning\n";
+- print "-c (--critical) = Min. number of messages in queu to generate critical alert ( w < c )\n";
++ print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n";
+ print "-W (--Warning) = Min. number of messages for same domain in queue to generate warning\n";
+ print "-C (--Critical) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
+ print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";
================================================================
Index: SOURCES/nagios-plugins-check_ldap_pointer.patch
diff -u /dev/null SOURCES/nagios-plugins-check_ldap_pointer.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_ldap_pointer.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 32_check_ldap_pointer.dpatch by Jan Wagner <waja at cyconet.org>
+## patch provided by dann frazier <dannf at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Using deprecated interfaces of libldap API
+
+ at DPATCH@
+--- nagios-plugins-1.4.11.orig/plugins/check_ldap.c 2007-07-07 16:20:40.000000000 -0600
++++ nagios-plugins-1.4.11/plugins/check_ldap.c 2008-01-30 15:14:14.000000000 -0700
+@@ -42,6 +42,7 @@
+ #include "utils.h"
+
+ #include <lber.h>
++#define LDAP_DEPRECATED 1
+ #include <ldap.h>
+
+ enum {
================================================================
Index: SOURCES/nagios-plugins-check_disk_local_option.patch
diff -u /dev/null SOURCES/nagios-plugins-check_disk_local_option.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_disk_local_option.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 31_check_disk_local_option.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix local option for check_disk
+
+ at DPATCH@
+diff -Nur nagios-plugins-1.4.11/plugins/check_disk.c.orig nagios-plugins-1.4.11/plugins/check_disk.c
+--- nagios-plugins-1.4.11/plugins/check_disk.c.orig 2007-12-08 17:34:05.000000000 +0100
++++ nagios-plugins-1.4.11/plugins/check_disk.c 2008-02-05 22:13:43.397159697 +0100
+@@ -475,7 +475,7 @@
+ {"iwarning", required_argument, 0, 'W'},
+ /* Dang, -C is taken. We might want to reshuffle this. */
+ {"icritical", required_argument, 0, 'K'},
+- {"local", required_argument, 0, 'l'},
++ {"local", no_argument, 0, 'l'},
+ {"stat-remote-fs", required_argument, 0, 'L'},
+ {"kilobytes", required_argument, 0, 'k'},
+ {"megabytes", required_argument, 0, 'm'},
================================================================
Index: SOURCES/nagios-plugins-fix_check_ntp_options.patch
diff -u /dev/null SOURCES/nagios-plugins-fix_check_ntp_options.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-fix_check_ntp_options.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_fix_check_ntp_options.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix options for check_ntp_time and check_ntp_peer
+
+ at DPATCH@
+--- nagios-plugins-1.4.11/plugins/check_ntp_time.c.orig 2008-01-26 00:03:57.486086968 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_time.c 2008-01-26 00:04:26.652580066 +0100
+@@ -631,7 +631,6 @@
+ print_usage(void)
+ {
+ printf (_("Usage:"));
+- printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
+- printf(" [-j <warn>] [-k <crit>] [-v verbose]\n");
++ printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
+ }
+
+--- nagios-plugins-1.4.11/plugins/check_ntp_peer.c.orig 2008-01-26 00:08:50.393996604 +0100
++++ nagios-plugins-1.4.11/plugins/check_ntp_peer.c 2008-01-26 00:09:36.762190836 +0100
+@@ -642,7 +642,7 @@
+ printf (" %s\n", _("Offset to result in critical status (seconds)"));
+ printf (" %s\n", "-W, --warning=THRESHOLD");
+ printf (" %s\n", _("Warning threshold for stratum"));
+- printf (" %s\n", "-W, --critical=THRESHOLD");
++ printf (" %s\n", "-C, --critical=THRESHOLD");
+ printf (" %s\n", _("Critical threshold for stratum"));
+ printf (" %s\n", "-j, --warning=THRESHOLD");
+ printf (" %s\n", _("Warning threshold for jitter"));
================================================================
Index: SOURCES/nagios-plugins-check_ntp_fixsefault_deprecate.patch
diff -u /dev/null SOURCES/nagios-plugins-check_ntp_fixsefault_deprecate.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_ntp_fixsefault_deprecate.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,81 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 29_check_ntp_fixsefault_deprecate.dpatch by Thomas Guyot-Sionnest <dermoth at aei.ca>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix check_ntp_time and check_ntp segfault, add deprecate hints
+
+ at DPATCH@
+--- nagios-plugins-1.4.11/plugins/check_ntp_time.c 2007/12/11 05:57:35 1861
++++ nagios-plugins-1.4.11/plugins/check_ntp_time.c 2008/01/05 14:09:29 1887
+@@ -274,7 +274,7 @@
+ /* if we haven't reached the current list's end, move everyone
+ * over one to the right, and insert the new candidate */
+ if(i<csize){
+- for(j=5; j>i; j--){
++ for(j=4; j>i; j--){
+ candidates[j]=candidates[j-1];
+ }
+ }
+@@ -337,6 +337,7 @@
+ servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
+ if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
+ memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
++ DBG(printf("Found %d peers to check\n", num_hosts));
+
+ /* setup each socket for writing, and the corresponding struct pollfd */
+ ai_tmp=ai;
+--- nagios-plugins-1.4.11/plugins/check_ntp.c 2007/12/11 05:57:35 1861
++++ nagios-plugins-1.4.11/plugins/check_ntp.c 2008/01/05 14:09:29 1887
+@@ -329,7 +329,7 @@
+ /* if we haven't reached the current list's end, move everyone
+ * over one to the right, and insert the new candidate */
+ if(i<csize){
+- for(j=5; j>i; j--){
++ for(j=4; j>i; j--){
+ candidates[j]=candidates[j-1];
+ }
+ }
+@@ -392,6 +392,7 @@
+ servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
+ if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
+ memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
++ DBG(printf("Found %d peers to check\n", num_hosts));
+
+ /* setup each socket for writing, and the corresponding struct pollfd */
+ ai_tmp=ai;
+@@ -837,11 +838,11 @@
+
+ printf ("Copyright (c) 2006 Sean Finney\n");
+ printf (COPYRIGHT, copyright, email);
+-
+- printf ("%s\n", _("This plugin checks the selected ntp server"));
+
+- printf ("\n\n");
+-
++ printf ("%s\n", _("This plugin checks the selected ntp server"));
++
++ printf ("\n\n");
++
+ print_usage();
+ printf (_(UT_HELP_VRSN));
+ printf (_(UT_HOST_PORT), 'p', "123");
+@@ -871,11 +872,17 @@
+ printf(" %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
+
+ printf (_(UT_SUPPORT));
++
++ printf("\n");
++ printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
++ printf ("%s\n\n", _("check_ntp_time istead."));
+ }
+
+ void
+ print_usage(void)
+ {
+- printf (_("Usage:"));
+- printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
++ printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
++ printf ("%s\n\n", _("check_ntp_time istead."));
++ printf (_("Usage:"));
++ printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
+ }
================================================================
Index: SOURCES/nagios-plugins-check_radius_segfault.patch
diff -u /dev/null SOURCES/nagios-plugins-check_radius_segfault.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_radius_segfault.patch Mon Apr 28 23:58:40 2008
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 27_check_radius_segfault.dpatch by Yasper Casper <komputnik at gmail.com>
+##
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.5~/plugins/check_radius.c nagios-plugins-1.4.5/plugins/check_radius.c
+--- nagios-plugins-1.4.5~/plugins/check_radius.c 2006-10-20 01:53:28.000000000 +0200
++++ nagios-plugins-1.4.5/plugins/check_radius.c 2006-11-20 20:38:49.000000000 +0100
+@@ -137,6 +137,14 @@
+ rc_read_dictionary (rc_conf_str (str)))
+ die (STATE_UNKNOWN, _("Config file error"));
+
++ /* Initialize Value Pair to prevent segfault on rc_avpair_add.
++ * debugging on radiuslib-ng show that the mem isn't allocated,
++ * and some random memory is in the USER-PASSWORD pair.
++ * So, after initialization, the password is filled with the correct values
++ */
++ data.send_pairs = NULL;
++ data.receive_pairs = NULL;
++
+ service = PW_AUTHENTICATE_ONLY;
+
+ if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
================================================================
Index: SOURCES/nagios-plugins-implicit-basename.patch
diff -u /dev/null SOURCES/nagios-plugins-implicit-basename.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-implicit-basename.patch Mon Apr 28 23:58:41 2008
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 26-implicit-basename.dpatch by <seanius at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.4~/plugins/check_procs.c nagios-plugins-1.4.4/plugins/check_procs.c
+--- nagios-plugins-1.4.4~/plugins/check_procs.c 2006-10-19 02:25:16.000000000 +0200
++++ nagios-plugins-1.4.4/plugins/check_procs.c 2006-11-17 09:26:57.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include "utils.h"
+
+ #include <pwd.h>
++#include <dirname.h>
+
+ int process_arguments (int, char **);
+ int validate_arguments (void);
================================================================
Index: SOURCES/nagios-plugins-check_smb_hostaddress.patch
diff -u /dev/null SOURCES/nagios-plugins-check_smb_hostaddress.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_smb_hostaddress.patch Mon Apr 28 23:58:41 2008
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_check_smb_hostaddress.dpatch by <seanius at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad sid~/plugins-scripts/check_disk_smb.pl sid/plugins-scripts/check_disk_smb.pl
+--- sid~/plugins-scripts/check_disk_smb.pl 2005-10-31 21:44:20.000000000 +0100
++++ sid/plugins-scripts/check_disk_smb.pl 2005-10-31 21:44:41.000000000 +0100
+@@ -23,7 +23,7 @@
+ use POSIX;
+ use strict;
+ use Getopt::Long;
+-use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $verbose);
++use vars qw($opt_P $opt_V $opt_h $opt_H $opt_s $opt_W $opt_u $opt_p $opt_w $opt_c $opt_a $verbose);
+ use vars qw($PROGNAME);
+ use lib utils.pm ;
+ use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
+@@ -49,7 +49,8 @@
+ "u=s" => \$opt_u, "username=s" => \$opt_u,
+ "s=s" => \$opt_s, "share=s" => \$opt_s,
+ "W=s" => \$opt_W, "workgroup=s" => \$opt_W,
+- "H=s" => \$opt_H, "hostname=s" => \$opt_H);
++ "H=s" => \$opt_H, "hostname=s" => \$opt_H,
++ "a=s" => \$opt_a, "address=s" => \$opt_a);
+
+ if ($opt_V) {
+ print_revision($PROGNAME,'$Revision$'); #'
+@@ -65,7 +66,7 @@
+ # Options checking
+
+ ($opt_H) || ($opt_H = shift) || usage("Host name not specified\n");
+-my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9]+\$?)$/);
++my $host = $1 if ($opt_H =~ /^([-_.A-Za-z0-9 ]+\$?)$/);
+ ($host) || usage("Invalid host: $opt_H\n");
+
+ ($opt_s) || ($opt_s = shift) || usage("Share volume not specified\n");
+@@ -142,6 +143,8 @@
+
+ my $workgroup = $1 if (defined($opt_W) && $opt_W =~ /(.*)/);
+
++my $address = $1 if (defined($opt_a) && $opt_a =~ /(.*)/);
++
+ # end of options checking
+
+
+@@ -160,10 +163,21 @@
+ # Execute an "ls" on the share using smbclient program
+ # get the results into $res
+ if (defined($workgroup)) {
+- $res = qx/$smbclient \/\/$host\/$share -W $workgroup -U $user%$pass $smbclientoptions -c ls/;
++ if (defined($address)) {
++ print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls\n" if ($verbose);
++ $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/;
++ } else {
++ print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose);
++ $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -c ls/;
++ }
+ } else {
+- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
+- $res = qx/$smbclient \/\/$host\/$share -U $user%$pass $smbclientoptions -c ls/;
++ if (defined($address)) {
++ print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -I $address -c ls\n" if ($verbose);
++ $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -I $address -c ls/;
++ } else {
++ print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose);
++ $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -c ls/;
++ }
+ }
+ #Turn off alarm
+ alarm(0);
+@@ -239,7 +253,7 @@
+
+ sub print_usage () {
+ print "Usage: $PROGNAME -H <host> -s <share> -u <user> -p <password>
+- -w <warn> -c <crit> [-W <workgroup>] [-P <port>]\n";
++ -w <warn> -c <crit> [-W <workgroup>] [-P <port>] [-a <IP>]\n";
+ }
+
+ sub print_help () {
+@@ -257,6 +271,8 @@
+ Share name to be tested
+ -W, --workgroup=STRING
+ Workgroup or Domain used (Defaults to \"WORKGROUP\")
++-a, --address=IP
++ IP-address of HOST (only necessary if HOST is in another network)
+ -u, --user=STRING
+ Username to log in to server. (Defaults to \"guest\")
+ -p, --password=STRING
================================================================
Index: SOURCES/nagios-plugins-check_game_cmdline.patch
diff -u /dev/null SOURCES/nagios-plugins-check_game_cmdline.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_game_cmdline.patch Mon Apr 28 23:58:41 2008
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 18_check_game_cmdline.dpatch by <seanius at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins~/plugins/check_game.c nagios-plugins/plugins/check_game.c
+--- nagios-plugins~/plugins/check_game.c 2005-10-11 16:45:44.000000000 +0200
++++ nagios-plugins/plugins/check_game.c 2005-10-11 16:47:07.000000000 +0200
+@@ -328,7 +328,7 @@
+ print_usage (void)
+ {
+ printf (_("Usage:"));
+- printf (" %s <game> <ip_address> [-p port] [-gf game_field] [-mf map_field] [-pf ping_field]\n", progname);
++ printf (" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G game-time] [-H hostname] <game> <ip_address>\n", progname);
+ }
+
+ /******************************************************************************
================================================================
Index: SOURCES/nagios-plugins-check_log_paths.patch
diff -u /dev/null SOURCES/nagios-plugins-check_log_paths.patch:1.1
--- /dev/null Mon Apr 28 23:58:46 2008
+++ SOURCES/nagios-plugins-check_log_paths.patch Mon Apr 28 23:58:41 2008
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_check_log_paths.dpatch by <seanius at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins~/plugins-scripts/check_log.sh nagios-plugins/plugins-scripts/check_log.sh
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list