summaryrefslogtreecommitdiffstats
path: root/web/attachments/279991-50_misc_typos.dpatch
diff options
context:
space:
mode:
Diffstat (limited to 'web/attachments/279991-50_misc_typos.dpatch')
-rw-r--r--web/attachments/279991-50_misc_typos.dpatch322
1 files changed, 322 insertions, 0 deletions
diff --git a/web/attachments/279991-50_misc_typos.dpatch b/web/attachments/279991-50_misc_typos.dpatch
new file mode 100644
index 0000000..a40d67b
--- /dev/null
+++ b/web/attachments/279991-50_misc_typos.dpatch
@@ -0,0 +1,322 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2## 50_misc_typos.dpatch by <andy@andrewprice.me.uk> modified for 1.4.10 by
3## Jan Wagner <waja@cyconet.org>
4##
5## DP: This patch fixes various typos and grammatical errors in plugins/*.c.
6## DP: It is based on Malcolm Parsons' patch posted at https://launchpad.net/bugs/64595
7
8@DPATCH@
9diff -urNad nagios-plugins-1.4.12~/plugins/check_dns.c nagios-plugins-1.4.12/plugins/check_dns.c
10--- nagios-plugins-1.4.12~/plugins/check_dns.c 2008-05-13 11:14:45.000000000 +0200
11+++ nagios-plugins-1.4.12/plugins/check_dns.c 2008-06-03 11:08:17.000000000 +0200
12@@ -255,7 +255,7 @@
13 printf (_("DNS CRITICAL - %s\n"),
14 !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
15 else
16- printf (_("DNS UNKNOW - %s\n"),
17+ printf (_("DNS UNKNOWN - %s\n"),
18 !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
19
20 return result;
21diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c
22--- nagios-plugins-1.4.12~/plugins/check_http.c 2008-05-07 12:02:42.000000000 +0200
23+++ nagios-plugins-1.4.12/plugins/check_http.c 2008-06-03 11:08:17.000000000 +0200
24@@ -1054,7 +1054,7 @@
25
26 url = malloc (strcspn (pos, "\r\n"));
27 if (url == NULL)
28- die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate url\n"));
29+ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
30
31 while (pos) {
32 sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i);
33@@ -1085,7 +1085,7 @@
34
35 url = realloc (url, strcspn (pos, "\r\n") + 1);
36 if (url == NULL)
37- die (STATE_UNKNOWN, _("HTTP UNKNOWN - could not allocate url\n"));
38+ die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
39
40 /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
41 if (sscanf (pos, HD1, type, addr, &i, url) == 4)
42@@ -1253,7 +1253,7 @@
43 printf (" %s\n", _("Connect via SSL. Port defaults to 443"));
44 printf (" %s\n", "-C, --certificate=INTEGER");
45 printf (" %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
46- printf (" %s\n", _("(when this option is used the url is not checked.)\n"));
47+ printf (" %s\n", _("(when this option is used the URL is not checked.)\n"));
48 #endif
49
50 printf (" %s\n", "-e, --expect=STRING");
51diff -urNad nagios-plugins-1.4.12~/plugins/check_ldap.c nagios-plugins-1.4.12/plugins/check_ldap.c
52--- nagios-plugins-1.4.12~/plugins/check_ldap.c 2008-06-03 11:08:16.000000000 +0200
53+++ nagios-plugins-1.4.12/plugins/check_ldap.c 2008-06-03 11:08:17.000000000 +0200
54@@ -196,7 +196,7 @@
55 LDAP_SUCCESS) {
56 if (verbose)
57 ldap_perror(ld, "ldap_bind");
58- printf (_("Could not bind to the ldap-server\n"));
59+ printf (_("Could not bind to the LDAP server\n"));
60 return STATE_CRITICAL;
61 }
62
63diff -urNad nagios-plugins-1.4.12~/plugins/check_mysql.c nagios-plugins-1.4.12/plugins/check_mysql.c
64--- nagios-plugins-1.4.12~/plugins/check_mysql.c 2008-05-07 12:02:42.000000000 +0200
65+++ nagios-plugins-1.4.12/plugins/check_mysql.c 2008-06-03 11:08:17.000000000 +0200
66@@ -381,7 +381,7 @@
67
68 printf (_(COPYRIGHT), copyright, email);
69
70- printf ("%s\n", _("This program tests connections to a mysql server"));
71+ printf ("%s\n", _("This program tests connections to a MySQL server"));
72
73 printf ("\n\n");
74
75diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c nagios-plugins-1.4.12/plugins/check_procs.c
76--- nagios-plugins-1.4.12~/plugins/check_procs.c 2008-06-03 11:08:16.000000000 +0200
77+++ nagios-plugins-1.4.12/plugins/check_procs.c 2008-06-03 11:14:09.000000000 +0200
78@@ -730,7 +730,7 @@
79 printf (" %s\n", _("PROCS - number of processes (default)"));
80 printf (" %s\n", _("VSZ - virtual memory size"));
81 printf (" %s\n", _("RSS - resident set memory size"));
82- printf (" %s\n", _("CPU - percentage cpu"));
83+ printf (" %s\n", _("CPU - percentage CPU"));
84 /* only linux etime is support currently */
85 #if defined( __linux__ )
86 printf (" %s\n", _("ELAPSED - time elapsed in seconds"));
87@@ -749,11 +749,11 @@
88 printf (" %s\n", "-p, --ppid=PPID");
89 printf (" %s\n", _("Only scan for children of the parent process ID indicated."));
90 printf (" %s\n", "-z, --vsz=VSZ");
91- printf (" %s\n", _("Only scan for processes with vsz higher than indicated."));
92+ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated."));
93 printf (" %s\n", "-r, --rss=RSS");
94- printf (" %s\n", _("Only scan for processes with rss higher than indicated."));
95+ printf (" %s\n", _("Only scan for processes with RSS higher than indicated."));
96 printf (" %s\n", "-P, --pcpu=PCPU");
97- printf (" %s\n", _("Only scan for processes with pcpu higher than indicated."));
98+ printf (" %s\n", _("Only scan for processes with PCPU higher than indicated."));
99 printf (" %s\n", "-u, --user=USER");
100 printf (" %s\n", _("Only scan for processes with user name or ID indicated."));
101 printf (" %s\n", "-a, --argument-array=STRING");
102@@ -789,9 +789,9 @@
103 printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing"));
104 printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
105 printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
106- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
107+ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
108 printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
109- printf (" %s\n", _("Alert if cpu of any processes over 10%% or 20%%"));
110+ printf (" %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
111
112 printf (_(UT_SUPPORT));
113 }
114diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c.rej nagios-plugins-1.4.12/plugins/check_procs.c.rej
115--- nagios-plugins-1.4.12~/plugins/check_procs.c.rej 1970-01-01 01:00:00.000000000 +0100
116+++ nagios-plugins-1.4.12/plugins/check_procs.c.rej 2008-06-03 11:08:17.000000000 +0200
117@@ -0,0 +1,21 @@
118+***************
119+*** 781,789 ****
120+ printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing"));
121+ printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
122+ printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
123+- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
124+ printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
125+- printf (" %s\n\n", _("Alert if cpu of any processes over 10%% or 20%%"));
126+
127+ printf (_(UT_SUPPORT));
128+ }
129+--- 781,789 ----
130+ printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing"));
131+ printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
132+ printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
133++ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
134+ printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
135++ printf (" %s\n\n", _("Alert if CPU of any processes over 10%% or 20%%"));
136+
137+ printf (_(UT_SUPPORT));
138+ }
139diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c
140--- nagios-plugins-1.4.12~/plugins/check_radius.c 2008-06-03 11:08:16.000000000 +0200
141+++ nagios-plugins-1.4.12/plugins/check_radius.c 2008-06-03 11:16:39.000000000 +0200
142@@ -325,7 +325,7 @@
143 printf ("Copyright (c) 1999 Robert August Vincent II\n");
144 printf (COPYRIGHT, copyright, email);
145
146- printf("%s\n", _("Tests to see if a radius server is accepting connections."));
147+ printf("%s\n", _("Tests to see if a RADIUS server is accepting connections."));
148
149 printf ("\n\n");
150
151@@ -352,7 +352,7 @@
152 printf (_(UT_TIMEOUT), timeout_interval);
153
154 printf ("\n");
155- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections."));
156+ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
157 printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
158 printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
159 printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
160diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c.rej nagios-plugins-1.4.12/plugins/check_radius.c.rej
161--- nagios-plugins-1.4.12~/plugins/check_radius.c.rej 1970-01-01 01:00:00.000000000 +0100
162+++ nagios-plugins-1.4.12/plugins/check_radius.c.rej 2008-06-03 11:08:17.000000000 +0200
163@@ -0,0 +1,35 @@
164+***************
165+*** 350,365 ****
166+
167+ printf (_(UT_TIMEOUT), timeout_interval);
168+
169+- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections."));
170+ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
171+ printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
172+ printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
173+ printf ("%s\n", _("The password option presents a substantial security issue because the"));
174+ printf ("%s\n", _("password can be determined by careful watching of the command line in"));
175+ printf ("%s\n", _("a process listing. This risk is exacerbated because nagios will"));
176+- printf ("%s\n", _("run the plugin at regular prdictable intervals. Please be sure that"));
177+ printf ("%s\n", _("the password used does not allow access to sensitive system resources,"));
178+- printf ("%s\n", _("otherwise compormise could occur."));
179+
180+ printf (_(UT_SUPPORT));
181+ }
182+--- 350,365 ----
183+
184+ printf (_(UT_TIMEOUT), timeout_interval);
185+
186++ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
187+ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
188+ printf ("%s\n", _("name and password. A configuration file may also be present. The format of"));
189+ printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
190+ printf ("%s\n", _("The password option presents a substantial security issue because the"));
191+ printf ("%s\n", _("password can be determined by careful watching of the command line in"));
192+ printf ("%s\n", _("a process listing. This risk is exacerbated because nagios will"));
193++ printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that"));
194+ printf ("%s\n", _("the password used does not allow access to sensitive system resources,"));
195++ printf ("%s\n", _("otherwise compromise could occur."));
196+
197+ printf (_(UT_SUPPORT));
198+ }
199diff -urNad nagios-plugins-1.4.12~/plugins/check_snmp.c nagios-plugins-1.4.12/plugins/check_snmp.c
200--- nagios-plugins-1.4.12~/plugins/check_snmp.c 2008-05-07 12:02:42.000000000 +0200
201+++ nagios-plugins-1.4.12/plugins/check_snmp.c 2008-06-03 11:08:17.000000000 +0200
202@@ -928,7 +928,7 @@
203
204 printf (COPYRIGHT, copyright, email);
205
206- printf ("%s\n", _("Check status of remote machines and obtain sustem information via SNMP"));
207+ printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
208
209 printf ("\n\n");
210
211@@ -964,8 +964,8 @@
212 printf (" %s\n", "-o, --oid=OID(s)");
213 printf (" %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
214 printf (" %s\n", "-m, --miblist=STRING");
215- printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric oids or 'ALL'"));
216- printf (" %s\n", _("for symbolic oids.)"));
217+ printf (" %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
218+ printf (" %s\n", _("for symbolic OIDs.)"));
219 printf (" %s\n", "-d, --delimiter=STRING");
220 printf (_(" Delimiter to use when parsing returned data. Default is \"%s\""), DEFAULT_DELIMITER);
221 printf (" %s\n", _("Any data on the right hand side of the delimiter is considered"));
222diff -urNad nagios-plugins-1.4.12~/plugins/check_tcp.c nagios-plugins-1.4.12/plugins/check_tcp.c
223--- nagios-plugins-1.4.12~/plugins/check_tcp.c 2008-05-07 12:02:42.000000000 +0200
224+++ nagios-plugins-1.4.12/plugins/check_tcp.c 2008-06-03 11:08:17.000000000 +0200
225@@ -623,7 +623,7 @@
226 printf (" %s\n", "-q, --quit=STRING");
227 printf (" %s\n", _("String to send server to initiate a clean close of the connection"));
228 printf (" %s\n", "-r, --refuse=ok|warn|crit");
229- printf (" %s\n", _("Accept tcp refusals with states ok, warn, crit (default: crit)"));
230+ printf (" %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
231 printf (" %s\n", "-M, --mismatch=ok|warn|crit");
232 printf (" %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
233 printf (" %s\n", "-j, --jail");
234diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c
235--- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200
236+++ nagios-plugins-1.4.12/plugins/check_ups.c 2008-06-03 11:19:51.000000000 +0200
237@@ -417,7 +417,7 @@
238 len = strlen(ptr);
239 if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0;
240 if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) {
241- printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);
242+ printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name);
243 return ERROR;
244 }
245
246@@ -584,7 +584,7 @@
247 validate_arguments (void)
248 {
249 if (! ups_name) {
250- printf ("%s\n", _("Error : no ups indicated"));
251+ printf ("%s\n", _("Error : no UPS indicated"));
252 return ERROR;
253 }
254 return OK;
255@@ -635,7 +635,7 @@
256 printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
257 printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
258 printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
259- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL"));
260+ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
261 printf ("%s\n", _("state."));
262
263 printf ("\n");
264@@ -645,7 +645,7 @@
265 printf (" %s\n", _("of that variable. If the remote host has multiple UPS that are being monitored"));
266 printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check."));
267 printf ("\n");
268- printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's"));
269+ printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
270 printf (" %s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the"));
271 printf (" %s\n", _("package installed on your system, you can download it from"));
272 printf (" %s\n", _("http://www.networkupstools.org"));
273diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c.rej nagios-plugins-1.4.12/plugins/check_ups.c.rej
274--- nagios-plugins-1.4.12~/plugins/check_ups.c.rej 1970-01-01 01:00:00.000000000 +0100
275+++ nagios-plugins-1.4.12/plugins/check_ups.c.rej 2008-06-03 11:08:17.000000000 +0200
276@@ -0,0 +1,34 @@
277+***************
278+*** 636,642 ****
279+ printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
280+ printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
281+ printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
282+- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL"));
283+ printf ("%s\n\n", _("state."));
284+
285+ printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,"));
286+--- 636,642 ----
287+ printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power"));
288+ printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the"));
289+ printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING"));
290++ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL"));
291+ printf ("%s\n\n", _("state."));
292+
293+ printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,"));
294+***************
295+*** 644,650 ****
296+ printf ("%s\n", _("that variable. If the remote host has multiple UPS that are being monitored you"));
297+ printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check."));
298+
299+- printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's"));
300+ printf ("%s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the"));
301+ printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org"));
302+
303+--- 644,650 ----
304+ printf ("%s\n", _("that variable. If the remote host has multiple UPS that are being monitored you"));
305+ printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check."));
306+
307++ printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's"));
308+ printf ("%s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the"));
309+ printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org"));
310+
311diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl
312--- nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl 2006-07-05 15:45:57.000000000 +0200
313+++ nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl 2008-06-03 11:08:17.000000000 +0200
314@@ -588,7 +588,7 @@
315 print " Checks the number of messages in the mail queue (supports multiple sendmail queues, qmail)\n";
316 print " Feedback/patches to support non-sendmail mailqueue welcome\n\n";
317 print "-w (--warning) = Min. number of messages in queue to generate warning\n";
318- print "-c (--critical) = Min. number of messages in queu to generate critical alert ( w < c )\n";
319+ print "-c (--critical) = Min. number of messages in queue to generate critical alert ( w < c )\n";
320 print "-W (--Warning) = Min. number of messages for same domain in queue to generate warning\n";
321 print "-C (--Critical) = Min. number of messages for same domain in queue to generate critical alert ( W < C )\n";
322 print "-t (--timeout) = Plugin timeout in seconds (default = $utils::TIMEOUT)\n";