Fix a lot of typos reported by codespell

This commit is contained in:
Jan Wagner 2023-04-14 14:37:47 +00:00
parent e44dcb80f1
commit 0f3703e641
64 changed files with 154 additions and 154 deletions

View file

@ -20,7 +20,7 @@ Using the DLPI support on SysV systems to get the host MAC address in check_dhcp
Stenberg, Daniel
Copyright (c) 1996 - 2004, Daniel Stenberg, <daniel@haxx.se>
http://curl.haxx.se/
Use of duplication of macros in m4/np_curl.m4 (slighly adapted for m4/uriparser.m4 too)
Use of duplication of macros in m4/np_curl.m4 (slightly adapted for m4/uriparser.m4 too)
Coreutils team
Copyright (C) 91, 1995-2004 Free Software Foundation, Inc.

30
NEWS
View file

@ -9,12 +9,12 @@ This file documents the major additions and syntax changes between releases.
check_http/check_curl: add chunked encoding test
check_log: Added --exclude to exclude patterns
check_log: Add tests
check_disk: Clarify usage possibilites
check_disk: Clarify usage possibilities
FIXES
fixed two PRId64 to PRIu64 in perfdata_uint64
check_pgsql: Removing is_pg_dbname alltogether,using postgres API.
check_http: Remove superflous CRLF in HTTP-Requests
check_pgsql: Removing is_pg_dbname altogether,using postgres API.
check_http: Remove superfluous CRLF in HTTP-Requests
check_curl: detect ipv6
check_icmp: fix parsing help/version long options
check_http: fix test plan
@ -40,7 +40,7 @@ This file documents the major additions and syntax changes between releases.
2.3.2 20th Oct 2022
GENERAL
Use netcat-openbsd for debian explicitely (by @RincewindsHat #1704)
Use netcat-openbsd for debian explicitly (by @RincewindsHat #1704)
Replace egrep with grep -E (by @RincewindsHat #1791)
Use silent automake by default (by @RincewindsHat #1747)
@ -123,7 +123,7 @@ This file documents the major additions and syntax changes between releases.
check_log: Modernize check log (by @RincewindsHat #1692)
check_mailq: remove duplicate W=i/C=i args in check_mailq.pl (by @ichdasich #1755)
check_ntp: Check ntp remove unused variables (by @RincewindsHat #1781)
check_pgsql: Using snprintf which honors the buffers size and guarantees null temination. (Closes: #1601) (by @waja #1663)
check_pgsql: Using snprintf which honors the buffers size and guarantees null termination. (Closes: #1601) (by @waja #1663)
check_procs: Fix double percentage sign in usage (by @RincewindsHat #1743)
check_sensors.sh: Make shellcheck happier (by @RincewindsHat #1679)
check_snmp: Fixed option description authpassword -> authpasswd + whitespaces (by @RincewindsHat #1676)
@ -165,7 +165,7 @@ This file documents the major additions and syntax changes between releases.
check_apt: adding packages-warning option
check_load: Adding top consuming processes option
check_http: Adding Proxy-Authorization and extra headers
check_snmp: make calcualtion of timeout value in help output more clear
check_snmp: make calculation of timeout value in help output more clear
check_uptime: new plugin for checking uptime to see how long the system is running
check_curl: check_http replacement based on libcurl
check_http: Allow user to specify HTTP method after proxy CONNECT
@ -195,7 +195,7 @@ This file documents the major additions and syntax changes between releases.
check_procs: improve command examples for 'at least' processes
check_swap: repaired "-n" behaviour
check_disk: include -P switch in help
check_mailq: restore accidentially removed options
check_mailq: restore accidentally removed options
2.2 29th November 2016
ENHANCEMENTS
@ -236,7 +236,7 @@ This file documents the major additions and syntax changes between releases.
check_ssh now returns CRITICAL for protocol/version errors
If a plugin is invoked with -h/--help or -V/--version, the exit status
is now UNKNOWN
The superseeded check_ntp.pl was removed, please use check_ntp_peer or
The superseded check_ntp.pl was removed, please use check_ntp_peer or
check_ntp_time instead
2.1.2 16th October 2015
@ -263,7 +263,7 @@ This file documents the major additions and syntax changes between releases.
New check_mysql -n option to ignore authentication failures
Added IP and port or socket name to error messages
New check_ntp_time -o option to add expected offset
check_disk shows now troubled partions in verbose mode
check_disk shows now troubled partitions in verbose mode
check_dig has now support for drill and dig
check_dig has now support for -6 option
Add performance data to check_file_age
@ -357,10 +357,10 @@ This file documents the major additions and syntax changes between releases.
New check_procs -k option to ignore kernel threads (on Linux)
Let check_procs use /proc/<PID>/exe (if available) instead of getpid(2), unless -T is specified
Let check_mysql support SSL
Let check_mysql add perfromance metrics for all checks
Let check_mysql add performance metrics for all checks
New check_mysql -f option to specify a client options file
New check_mysql -g option to specify a client options group
New check_snmp --offset option to allow for adding/substracting an offset value to sensor data
New check_snmp --offset option to allow for adding/subtracting an offset value to sensor data
Let check_snmp support an arbitrary number of OIDs
Let check_ide_smart support NetBSD
@ -375,7 +375,7 @@ This file documents the major additions and syntax changes between releases.
Fix deprecated imports of check_nmap.py
WARNINGS
check_http behaviour of -k/--header changed since it does not seperate multiple headers by semicolons anymore. Use multiple -k switches instead.
check_http behaviour of -k/--header changed since it does not separate multiple headers by semicolons anymore. Use multiple -k switches instead.
check_http's --proxy_authorization option is now called --proxy-authorization (it was always documented this way)
The contrib directory has been removed from this distribution
@ -526,7 +526,7 @@ This file documents the major additions and syntax changes between releases.
check_ntp and check_ntp_peer now show proper jitter/stratum thresholds longopts in --help
check_dns now allow to repeat -a to match multiple possibly returned address (common with load balancers)
check_mysql and check_radius now try clearing password in processlist just like check_mysql_query
check_mysql and check_mysql_query now support sockets explicitely (-s, --socket)
check_mysql and check_mysql_query now support sockets explicitly (-s, --socket)
negate now has the ability to replace the status text as well (-s, --substitute)
Added performance data to check_ping
Added support for --extra-opts in all C plugins (disabled by default, see configure --help)
@ -566,7 +566,7 @@ This file documents the major additions and syntax changes between releases.
New check_disk option -L: Only check local filesystems, but call stat() on remote ones, too.
Thus accessibility of remote filesystems can be checked without any threshold comparison.
Check_disk's --help now prints some examples for the new features introduced in 1.4.8
New check_disk -i/-I option to ignore pathes/partitions based on regular expressions
New check_disk -i/-I option to ignore paths/partitions based on regular expressions
New check_disk -A option to select all filesystems explicitly
WARNING: check_disk's -E option must now be passed before -p or -r/-R arguments
Passing -E after -p or -r results in UNKNOWN state, now
@ -615,7 +615,7 @@ This file documents the major additions and syntax changes between releases.
Fixed MKINSTALLDIRS problem in po/
./configure now detects if possible to compile check_mysql
Fixed broken HELO in check_smtp
check_icmp now allows to set a minimum number of hosts required for successs (-m)
check_icmp now allows to set a minimum number of hosts required for success (-m)
check_icmp fix for *BSD when running for long time
check_ping times out 1 second quicker if host is unreachable
Root plugins installed with world executable

View file

@ -151,14 +151,14 @@ of testing against a set of desired exit status values.
=item *
Firstly, if C<$desiredExitStatus> is a reference to an array of exit
stati, if the actual exit status of the command is present in the
statuses, if the actual exit status of the command is present in the
array, it is used in the call to C<Test::ok(...)> when testing the
exit status.
=item *
Alternatively, if C<$desiredExitStatus> is a reference to a hash of
exit stati (mapped to the strings "continue" or "skip"), similar
exit statuses(mapped to the strings "continue" or "skip"), similar
processing to the above occurs with the side affect of determining if
any generated output testing should proceed. Note: only the string
"skip" will result in generated output testing being skipped.
@ -207,7 +207,7 @@ under the same terms as the Monitoring Plugins release.
my( %CACHE ) = ();
# I'm not really sure wether to house a site-specific cache inside
# I'm not really sure whether to house a site-specific cache inside
# or outside of the extracted source / build tree - lets default to outside
my( $CACHEFILENAME ) = ( exists( $ENV{'NPTEST_CACHE'} ) && $ENV{'NPTEST_CACHE'} )
? $ENV{'NPTEST_CACHE'} : "/var/tmp/NPTest.cache"; # "../Cache.pdd";

14
ROADMAP
View file

@ -7,7 +7,7 @@ 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 decieded that we will doing something along
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.
@ -39,9 +39,9 @@ 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.
Bu I would like to urge that all standard plugins contain
But I would like to urge that all standard plugins contain
validate_arguments(). I think this will help convey the idea that
validations hould be done, even if we don't insist on the specific
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:
@ -59,7 +59,7 @@ Reserved:
-F, --file = STRING (usually input)
-O, --output = STRING (output file)
Recommended, but not reserverd:
Recommended, but not reserved:
-I, --ipaddress = STRING
-C, --community = STRING
@ -69,7 +69,7 @@ Recommended, but not reserverd:
-P, --port = INT
-u, --url = STRING (also --username if --url is not needed)
I am suggesting that port alway be '-P' (uppercase) -- we are
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
@ -87,12 +87,12 @@ Programming:
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 alot of duplicated code, and techniques used that
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 seemless. A nice idea, but
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

View file

@ -189,7 +189,7 @@ func_basename ()
# to NONDIR_REPLACEMENT.
# value returned in "$func_dirname_result"
# basename: Compute filename of FILE.
# value retuned in "$func_basename_result"
# value returned in "$func_basename_result"
# Implementation must be kept synchronized with func_dirname
# and func_basename. For efficiency, we do not delegate to
# those functions but instead duplicate the functionality here.
@ -522,7 +522,7 @@ func_mkdir_p ()
# While some portion of DIR does not yet exist...
while test ! -d "$my_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
# list in case some portion of path contains whitespace.
my_dir_list="$my_directory_path:$my_dir_list"
# If the last portion added has no slash in it, the list is done
@ -4394,7 +4394,7 @@ EOF
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
have already dealt with, above (inluding dump-script), then
have already dealt with, above (including dump-script), then
report an error. Otherwise, targets might begin to believe
they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
namespace. The first time any user complains about this, we'll

View file

@ -30,7 +30,7 @@ int main(){
/* pipefd[1] is for writing to the pipe. We want the output
* that used to go to the standard output (file descriptor 1)
* to be written to the pipe. The following command does this,
* creating a new file descripter 1 (the lowest available)
* creating a new file descriptor 1 (the lowest available)
* that writes where pipefd[1] goes. */
dup (pipefd[1]); /* points pipefd at file descriptor */
/* the child isn't going to read from the pipe, so

View file

@ -932,7 +932,7 @@ elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
then
ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
# There must be no space between the %s and %n due to a wierd problem in sscanf where
# There must be no space between the %s and %n due to a weird problem in sscanf where
# it will return %n as longer than the line length
ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
ac_cv_ps_cols=9
@ -1552,7 +1552,7 @@ if test -n "$PATH_TO_SUDO"
then
AC_DEFINE_UNQUOTED(PATH_TO_SUDO,"$PATH_TO_SUDO",[path to sudo])
else
AC_MSG_WARN([Could not find sudo or eqivalent])
AC_MSG_WARN([Could not find sudo or equivalent])
fi
AC_PATH_PROG(PATH_TO_MAILQ,mailq)
@ -1563,7 +1563,7 @@ if test -n "$PATH_TO_MAILQ"
then
AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq])
else
AC_MSG_WARN([Could not find mailq or eqivalent])
AC_MSG_WARN([Could not find mailq or equivalent])
fi
AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat)
@ -1574,7 +1574,7 @@ if test -n "$PATH_TO_QMAIL_QSTAT"
then
AC_DEFINE_UNQUOTED(PATH_TO_QMAIL_QSTAT,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat])
else
AC_MSG_WARN([Could not find qmail-qstat or eqivalent])
AC_MSG_WARN([Could not find qmail-qstat or equivalent])
fi
dnl SWAP info required is amount allocated/available and amount free
@ -1832,7 +1832,7 @@ AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION(0.15)
dnl Check for Redhat spopen problem
dnl Wierd problem where ECHILD is returned from a wait call in error
dnl Weird problem where ECHILD is returned from a wait call in error
dnl Only appears to affect nslookup and dig calls. Only affects redhat around
dnl 2.6.9-11 (okay in 2.6.9-5). Redhat investigating root cause
dnl We patch plugins/popen.c

View file

@ -31,7 +31,7 @@
<preface id="preface"><title>Preface</title>
<para>The purpose of this guidelines is to provide a reference for
the plugin developers and encourage the standarization of the
the plugin developers and encourage the standardization of the
different kind of plugins: C, shell, perl, python, etc.</para>
<para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
@ -374,7 +374,7 @@
<listitem><para>s - seconds (also us, ms)</para></listitem>
<listitem><para>% - percentage</para></listitem>
<listitem><para>B - bytes (also KB, MB, TB)</para></listitem>
<listitem><para>c - a continous counter (such as bytes
<listitem><para>c - a continuous counter (such as bytes
transmitted on an interface)</para></listitem>
</orderedlist>
</listitem>
@ -397,7 +397,7 @@
<section><title>Don't execute system commands without specifying their
full path</title>
<para>Don't use exec(), popen(), etc. to execute external
commands without explicity using the full path of the external
commands without explicitly using the full path of the external
program.</para>
<para>Doing otherwise makes the plugin vulnerable to hijacking
@ -655,7 +655,7 @@
<para>If possible when writing lists, use tokens to make the
list easy to remember and non-order dependent - so
check_disk uses '-c 10000,10%' so that it is clear which is
the precentage and which is the KB values (note that due to
the percentage and which is the KB values (note that due to
my own lack of foresight, that used to be '-c 10000:10%' but
such constructs should all be changed for consistency,
though providing reverse compatibility is fairly
@ -686,7 +686,7 @@ all the current tests and report an overall success rate.
<para>These use perl's Test::More. To do a one time test, run "cd plugins && perl t/check_disk.t".
</para>
<para>There will somtimes be failures seen in this output which are known failures that
<para>There will sometimes be failures seen in this output which are known failures that
need to be fixed. As long as the return code is 0, it will be reported as "test pass".
(If you have a fix so that the specific test passes, that will be gratefully received!)
</para>
@ -846,7 +846,7 @@ setup the tests. Run "make test" to run all the tests.
<para>It is determined to be not redundant (for instance, we would not
add a new version of check_disk just because someone had provide
a plugin that had perf checking - we would incorporate the features
into an exisiting plugin)</para>
into an existing plugin)</para>
</listitem>
<listitem>
<para>One of the developers has had the time to audit the code and declare

View file

@ -78,7 +78,7 @@ static char *default_file_in_path(void);
/*
* Parse_locator decomposes a string of the form
* [stanza][@filename]
* into its seperate parts.
* into its separate parts.
*/
static void
parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
@ -169,7 +169,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
if (isspace(c))
continue;
switch (c) {
/* globble up coment lines */
/* globble up comment lines */
case ';':
case '#':
GOBBLE_TO(f, c, '\n');

View file

@ -176,14 +176,14 @@ main (int argc, char **argv)
ok (result == UNSET, "(initialised) Checking exit code is reset");
command = (char *)malloc(COMMAND_LINE);
strcpy(command, "/bin/echo3456 non-existant command");
strcpy(command, "/bin/echo3456 non-existent command");
result = cmd_run (command, &chld_out, &chld_err, 0);
ok (chld_out.lines == 0,
"Non existant command, so no output");
"Non existent command, so no output");
ok (chld_err.lines == 0,
"No stderr either");
ok (result == 3, "Get return code 3 (?) for non-existant command");
ok (result == 3, "Get return code 3 (?) for non-existent command");
/* ensure everything is empty again */
@ -192,14 +192,14 @@ main (int argc, char **argv)
result = UNSET;
command = (char *)malloc(COMMAND_LINE);
strcpy(command, "/bin/sh non-existant-file");
strcpy(command, "/bin/sh non-existent-file");
result = cmd_run (command, &chld_out, &chld_err, 0);
ok (chld_out.lines == 0,
"/bin/sh returns no stdout when file is missing...");
ok (chld_err.lines == 1,
"...but does give an error line");
ok (strstr(chld_err.line[0],"non-existant-file") != NULL, "And missing filename is in error message");
ok (strstr(chld_err.line[0],"non-existent-file") != NULL, "And missing filename is in error message");
ok (result != 0, "Get non-zero return code from /bin/sh");
@ -219,11 +219,11 @@ main (int argc, char **argv)
result = UNSET;
command = (char *)malloc(COMMAND_LINE);
strcpy(command, "/bin/non-existant-command");
strcpy(command, "/bin/non-existent-command");
result = cmd_run (command, &chld_out, &chld_err, 0);
ok (chld_out.lines == 0,
"/bin/non-existant-command returns no stdout...");
"/bin/non-existent-command returns no stdout...");
ok (chld_err.lines == 0,
"...and no stderr output either");
ok (result == 3, "Get return code 3 = UNKNOWN when command does not exist");

View file

@ -88,10 +88,10 @@ main (int argc, char **argv)
cflags, 3,strdup("regex on dev names:"));
np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"),
cflags, 0,
strdup("regex on non existant dev/path:"));
strdup("regex on non existent dev/path:"));
np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"),
cflags | REG_ICASE,0,
strdup("regi on non existant dev/path:"));
strdup("regi on non existent dev/path:"));
np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"),
cflags, 3,
strdup("partial devname regex match:"));

View file

@ -10,7 +10,7 @@ if (! -e "./test_ini3") {
# array of argument arrays
# - First value is the expected return code
# - 2nd value is the NAGIOS_CONFIG_PATH
# TODO: looks like we look in default path after looking trough this variable - shall we?
# TODO: looks like we look in default path after looking through this variable - shall we?
# - 3rd value is the plugin name
# - 4th is the ini locator
my @TESTS = (

View file

@ -10,7 +10,7 @@ if (! -e "./test_opts3") {
# array of argument arrays
# - First value is the expected return code
# - 2nd value is the NAGIOS_CONFIG_PATH
# TODO: looks like we look in default path after looking trough this variable - shall we?
# TODO: looks like we look in default path after looking through this variable - shall we?
# - 3rd value is the plugin name
# - 4th and up are arguments
my @TESTS = (

View file

@ -395,7 +395,7 @@ main (int argc, char **argv)
ok( temp_state_data==NULL, "Older data version gives NULL" );
temp_state_key->data_version=54;
temp_state_key->_filename="var/nonexistant";
temp_state_key->_filename="var/nonexistent";
temp_state_data = np_state_read();
ok( temp_state_data==NULL, "Missing file gives NULL" );
ok( this_monitoring_plugin->state->state_data==NULL, "No state information" );

View file

@ -161,7 +161,7 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
}
/* parent picks up execution here */
/* close childs descriptors in our address space */
/* close children descriptors in our address space */
close (pfd[1]);
close (pfderr[1]);

View file

@ -81,7 +81,7 @@ AC_DEFUN([np_check_lib_mariadbclient],
], [with_mysql=no], [$np_mysql_libs])
])
dnl Will take $1, find last occurrance of -LDIR and add DIR to LD_RUN_PATH
dnl Will take $1, find last occurrence of -LDIR and add DIR to LD_RUN_PATH
AC_DEFUN([np_add_to_runpath],
[
dnl Need [[ ]] so autoconf gives us just one set

View file

@ -1,4 +1,4 @@
# (this check is rougly based on and inspired libcurl.m4)
# (this check is roughly based on and inspired libcurl.m4)
# URIPARSER_CHECK ([DEFAULT-ACTION], [MINIMUM-VERSION],
# [ACTION-IF-YES], [ACTION-IF-NO])
# Checks for uriparser library. DEFAULT-ACTION is the string yes or no to

View file

@ -274,7 +274,7 @@ get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code)
break;
case ICMP_TIMXCEED:
/* really 'out of reach', or non-existant host behind a router serving
/* really 'out of reach', or non-existent host behind a router serving
* two different subnets */
switch(icmp_code) {
case ICMP_TIMXCEED_INTRANS: msg = "Time to live exceeded in transit"; break;

View file

@ -257,6 +257,6 @@ void usage() {
printf("\tRSS - Real memory usage (kilobytes)\n");
printf("\t%%CPU - CPU usage\n");
printf("\tCOMMAND - Command being run\n");
printf("\tARGS - Full command line with arguements\n");
printf("\tARGS - Full command line with arguments\n");
return;
}

View file

@ -92,5 +92,5 @@ like( $res->output, $successOutput, "Output OK" );
$res = NPTest->testCmd(
"$sudo ./check_icmp -H $host_responsive -b 65507"
);
is( $res->return_code, 0, "Try max paket size" );
is( $res->return_code, 0, "Try max packet size" );
like( $res->output, $successOutput, "Output OK - Didn't overflow" );

View file

@ -28,7 +28,7 @@ use FindBin;
use lib "$FindBin::Bin";
use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
# make us session leader which makes all childs exit if we do
# make us session leader which makes all children exit if we do
setsid;
sub print_help ();

View file

@ -134,7 +134,7 @@ if (defined $ifdescr || defined $iftype) {
}
if ($status==0) {
$state = "UNKNOWN";
printf "$state: could not retrive ifdescr/iftype snmpkey - $status-$snmpkey\n";
printf "$state: could not retrieve ifdescr/iftype snmpkey - $status-$snmpkey\n";
$session->close;
exit $ERRORS{$state};
}
@ -187,7 +187,7 @@ if (defined $ifXTable) {
$name = $response->{$snmpIfDescr} ;
}
## if AdminStatus is down - some one made a consious effort to change config
## if AdminStatus is down - some one made a conscious effort to change config
##
if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
$answer = "Interface $name (index $snmpkey) is administratively down.";
@ -286,7 +286,7 @@ sub print_usage() {
printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n";
printf "Copyright (C) 2000 Christoph Kron\n";
printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n";
printf "This programm is licensed under the terms of the ";
printf "This program is licensed under the terms of the ";
printf "GNU General Public License\n(check source code for details)\n";
printf "\n\n";
}
@ -424,7 +424,7 @@ sub process_arguments() {
if (defined $seclevel && defined $secname) {
$session_opts{'-username'} = $secname;
# Must define a security level even though defualt is noAuthNoPriv
# Must define a security level even though default is noAuthNoPriv
unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
usage("Must define a valid security level even though default is noAuthNoPriv");
}

View file

@ -354,7 +354,7 @@ sub process_arguments() {
if (defined $seclevel && defined $secname) {
$session_opts{'-username'} = $secname;
# Must define a security level even though defualt is noAuthNoPriv
# Must define a security level even though default is noAuthNoPriv
unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
usage("Must define a valid security level even though default is noAuthNoPriv");
}

View file

@ -60,7 +60,7 @@ sub print_usage ();
sub connection ($$$$);
sub bindRemote ($$);
# -------------------------------------------------------------[ Enviroment ]--
# -------------------------------------------------------------[ Environment ]--
$ENV{'PATH'}='@TRUSTED_PATH@';
$ENV{'BASH_ENV'}='';
@ -208,7 +208,7 @@ MAIN:
# Just in case of problems, let's not hang the monitoring system
$SIG{'ALRM'} = sub {
print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
exit $ERRORS{"UNKNOWN"};
};

View file

@ -4,7 +4,7 @@
# transmittal.
#
# Initial version support sendmail's mailq command
# Support for mutiple sendmail queues (Carlos Canau)
# Support for multiple sendmail queues (Carlos Canau)
# Support for qmail (Benjamin Schmid)
# License Information:

View file

@ -5,7 +5,7 @@
# usage:
# check_rpc host service
#
# Check if an rpc serice is registered and running
# Check if an rpc service is registered and running
# using rpcinfo - $proto $host $prognum 2>&1 |";
#
# Use these hosts.cfg entries as examples

View file

@ -110,7 +110,7 @@ $pretty_uptime .= sprintf( "%d week%s, ", $weeks, $weeks == 1 ? "" : "s" ) if
$pretty_uptime .= sprintf( "%d day%s, ", $days, $days == 1 ? "" : "s" ) if $days;
$pretty_uptime .= sprintf( "%d hour%s, ", $hours, $hours == 1 ? "" : "s" ) if $hours;
$pretty_uptime .= sprintf( "%d minute%s, ", $mins, $mins == 1 ? "" : "s" ) if $mins;
# Replace last occurence of comma with "and"
# Replace last occurrence of comma with "and"
$pretty_uptime =~ s/, $/ and /;
# Always print the seconds (though it may be 0 seconds)
$pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" );

View file

@ -618,7 +618,7 @@ check_http (void)
#ifdef LIBCURL_FEATURE_SSL
/* set SSL version, warn about unsecure or unsupported versions */
/* set SSL version, warn about insecure or unsupported versions */
if (use_ssl) {
handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_SSLVERSION, ssl_version), "CURLOPT_SSLVERSION");
}
@ -986,7 +986,7 @@ GOT_FIRST_CERT:
}
} else {
/* this is a specific code in the command line to
* be returned when a redirection is encoutered
* be returned when a redirection is encountered
*/
}
result = max_state_alt (onredirect, result);
@ -2051,7 +2051,7 @@ print_usage (void)
printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
printf (" [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>] [-D]\n");
printf (" [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
printf (" [-b proxy_auth] [-f <ok|warning|critcal|follow|sticky|stickyport|curl>]\n");
printf (" [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
printf (" [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
printf (" [-A string] [-k string] [-S <version>] [--sni]\n");

View file

@ -587,7 +587,7 @@ process_arguments (int argc, char **argv)
/* Awful mistake where the range values do not make sense. Normally,
you alert if the value is within the range, but since we are using
freespace, we have to alert if outside the range. Thus we artifically
freespace, we have to alert if outside the range. Thus we artificially
force @ at the beginning of the range, so that it is backwards compatible
*/
case 'c': /* critical threshold */
@ -1115,7 +1115,7 @@ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
p->available_to_root = fsp->fsu_bfree;
p->used = fsp->fsu_blocks - fsp->fsu_bfree;
if (freespace_ignore_reserved) {
/* option activated : we substract the root-reserved space from the total */
/* option activated : we subtract the root-reserved space from the total */
p->total = fsp->fsu_blocks - p->available_to_root + p->available;
} else {
/* default behaviour : take all the blocks into account */
@ -1130,7 +1130,7 @@ get_path_stats (struct parameter_list *p, struct fs_usage *fsp) {
p->inodes_free_to_root = fsp->fsu_ffree; /* Free file nodes for root. */
p->inodes_used = fsp->fsu_files - fsp->fsu_ffree;
if (freespace_ignore_reserved) {
/* option activated : we substract the root-reserved inodes from the total */
/* option activated : we subtract the root-reserved inodes from the total */
/* not all OS report fsp->fsu_favail, only the ones with statvfs syscall */
/* for others, fsp->fsu_ffree == fsp->fsu_favail */
p->inodes_total = fsp->fsu_files - p->inodes_free_to_root + p->inodes_free;

View file

@ -75,7 +75,7 @@ main (int argc, char **argv)
{
char *command_line = NULL;
char input_buffer[MAX_INPUT_BUFFER];
char *address = NULL; /* comma seperated str with addrs/ptrs (sorted) */
char *address = NULL; /* comma separated str with addrs/ptrs (sorted) */
char **addresses = NULL;
int n_addresses = 0;
char *msg = NULL;

View file

@ -73,7 +73,7 @@ int wrta_p = FALSE;
int
main (int argc, char **argv)
{
/* normaly should be int result = STATE_UNKNOWN; */
/* normally should be int result = STATE_UNKNOWN; */
int status = STATE_UNKNOWN;
int result = 0;

View file

@ -198,7 +198,7 @@ test_file (char *path)
/*
* process command-line arguments
* returns true on succes, false otherwise
* returns true on success, false otherwise
*/
bool process_arguments (int argc, char **argv)
{
@ -1885,7 +1885,7 @@ print_usage (void)
printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
printf (" [-J <client certificate file>] [-K <private key>]\n");
printf (" [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
printf (" [-b proxy_auth] [-f <ok|warning|critcal|follow|sticky|stickyport>]\n");
printf (" [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport>]\n");
printf (" [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
printf (" [-A string] [-k string] [-S <version>] [--sni]\n");

View file

@ -222,7 +222,7 @@ main (int argc, char *argv[])
/* reset the alarm handler */
alarm (0);
/* calcutate the elapsed time and compare to thresholds */
/* calculate the elapsed time and compare to thresholds */
microsec = deltime (tv);
elapsed_time = (double)microsec / 1.0e6;

View file

@ -107,7 +107,7 @@ main (int argc, char **argv)
int i;
long numcpus;
double la[3] = { 0.0, 0.0, 0.0 }; /* NetBSD complains about unitialized arrays */
double la[3] = { 0.0, 0.0, 0.0 }; /* NetBSD complains about uninitialized arrays */
#ifndef HAVE_GETLOADAVG
char input_buffer[MAX_INPUT_BUFFER];
# ifdef HAVE_PROC_LOADAVG

View file

@ -10,7 +10,7 @@
*
* This file contains the check_ntp plugin
*
* This plugin to check ntp servers independant of any commandline
* This plugin to check ntp servers independent of any commandline
* programs or external libraries.
*
*
@ -79,7 +79,7 @@ typedef struct {
/* this structure holds data about results from querying offset from a peer */
typedef struct {
time_t waiting; /* ts set when we started waiting for a response */
int num_responses; /* number of successfully recieved responses */
int num_responses; /* number of successfully received responses */
uint8_t stratum; /* copied verbatim from the ntp_message */
double rtdelay; /* converted from the ntp_message */
double rtdisp; /* converted from the ntp_message */
@ -100,7 +100,7 @@ typedef struct {
/* NB: not necessarily NULL terminated! */
} ntp_control_message;
/* this is an association/status-word pair found in control packet reponses */
/* this is an association/status-word pair found in control packet responses */
typedef struct {
uint16_t assoc;
uint16_t status;
@ -575,7 +575,7 @@ double jitter_request(int *status){
}
}
}
if(verbose) printf("%d candiate peers available\n", num_candidates);
if(verbose) printf("%d candidate peers available\n", num_candidates);
if(verbose && syncsource_found) printf("synchronization source found\n");
if(! syncsource_found){
*status = STATE_UNKNOWN;
@ -597,7 +597,7 @@ double jitter_request(int *status){
/* By spec, putting the variable name "jitter" in the request
* should cause the server to provide _only_ the jitter value.
* thus reducing net traffic, guaranteeing us only a single
* datagram in reply, and making intepretation much simpler
* datagram in reply, and making interpretation much simpler
*/
/* Older servers doesn't know what jitter is, so if we get an
* error on the first pass we redo it with "dispersion" */

View file

@ -86,7 +86,7 @@ typedef struct {
/* NB: not necessarily NULL terminated! */
} ntp_control_message;
/* this is an association/status-word pair found in control packet reponses */
/* this is an association/status-word pair found in control packet responses */
typedef struct {
uint16_t assoc;
uint16_t status;
@ -189,7 +189,7 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
}
/* This function does all the actual work; roughly here's what it does
* beside setting the offest, jitter and stratum passed as argument:
* beside setting the offset, jitter and stratum passed as argument:
* - offset can be negative, so if it cannot get the offset, offset_result
* is set to UNKNOWN, otherwise OK.
* - jitter and stratum are set to -1 if they cannot be retrieved so any
@ -306,7 +306,7 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
/* Putting the wanted variable names in the request
* cause the server to provide _only_ the requested values.
* thus reducing net traffic, guaranteeing us only a single
* datagram in reply, and making intepretation much simpler
* datagram in reply, and making interpretation much simpler
*/
/* Older servers doesn't know what jitter is, so if we get an
* error on the first pass we redo it with "dispersion" */
@ -585,7 +585,7 @@ int main(int argc, char *argv[]){
/* set socket timeout */
alarm (socket_timeout);
/* This returns either OK or WARNING (See comment preceeding ntp_request) */
/* This returns either OK or WARNING (See comment proceeding ntp_request) */
result = ntp_request(server_address, &offset, &offset_result, &jitter, &stratum, &num_truechimers);
if(offset_result == STATE_UNKNOWN) {

View file

@ -81,7 +81,7 @@ typedef struct {
/* this structure holds data about results from querying offset from a peer */
typedef struct {
time_t waiting; /* ts set when we started waiting for a response */
int num_responses; /* number of successfully recieved responses */
int num_responses; /* number of successfully received responses */
uint8_t stratum; /* copied verbatim from the ntp_message */
double rtdelay; /* converted from the ntp_message */
double rtdisp; /* converted from the ntp_message */

View file

@ -273,7 +273,7 @@ main (int argc, char **argv)
}
}
/* filter kernel threads (childs of KTHREAD_PARENT)*/
/* filter kernel threads (children of KTHREAD_PARENT)*/
/* TODO adapt for other OSes than GNU/Linux
sorry for not doing that, but I've no other OSes to test :-( */
if (kthread_filter == 1) {
@ -787,7 +787,7 @@ print_help (void)
printf (" %s\n", "-C, --command=COMMAND");
printf (" %s\n", _("Only scan for exact matches of COMMAND (without path)."));
printf (" %s\n", "-X, --exclude-process");
printf (" %s\n", _("Exclude processes which match this comma seperated list"));
printf (" %s\n", _("Exclude processes which match this comma separated list"));
printf (" %s\n", "-k, --no-kthreads");
printf (" %s\n", _("Only scan for non kernel threads (works on Linux only)."));

View file

@ -178,7 +178,7 @@ main (int argc, char **argv)
/* watch for the REAL connection string */
result = recv (sd, buffer, MAX_INPUT_BUFFER - 1, 0);
buffer[result] = '\0'; /* null terminate recieved buffer */
buffer[result] = '\0'; /* null terminate received buffer */
/* return a CRITICAL status if we couldn't read any data */
if (result == -1) {
@ -436,7 +436,7 @@ print_help (void)
printf ("\n");
printf ("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return"));
printf ("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
printf ("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful connects,"));
printf ("%s\n", _("but incorrect response messages from the host result in STATE_WARNING return"));
printf ("%s\n", _("values."));

View file

@ -844,7 +844,7 @@ print_help (void)
printf (UT_VERBOSE);
printf("\n");
printf ("%s\n", _("Successul connects return STATE_OK, refusals and timeouts return"));
printf ("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
printf ("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN. Successful"));
printf ("%s\n", _("connects, but incorrect response messages from the host result in"));
printf ("%s\n", _("STATE_WARNING return values."));

View file

@ -1274,7 +1274,7 @@ print_help (void)
printf (" %s\n", "--rate-multiplier");
printf (" %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
printf (" %s\n", "--offset=OFFSET");
printf (" %s\n", _("Add/substract the specified OFFSET to numeric sensor data"));
printf (" %s\n", _("Add/subtract the specified OFFSET to numeric sensor data"));
/* Tests Against Strings */
printf (" %s\n", "-s, --string=STRING");

View file

@ -552,7 +552,7 @@ validate_arguments (void)
}
else if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) {
/* This is NOT triggered if warn and crit are different units, e.g warn is percentage
* and crit is absolut. We cannot determine the condition at this point since we
* and crit is absolute. We cannot determine the condition at this point since we
* dont know the value of total swap yet
*/
usage4(_("Warning should be more than critical"));

View file

@ -128,7 +128,7 @@ main (int argc, char **argv)
SERVICE[i] = toupper(SERVICE[i]);
}
/* set up a resonable buffer at first (will be realloc()'ed if
/* set up a reasonable buffer at first (will be realloc()'ed if
* user specifies other options) */
server_expect = calloc(sizeof(char *), 2);

View file

@ -507,7 +507,7 @@ process_arguments (int argc, char **argv)
usage2 (_("Invalid hostname/address"), optarg);
}
break;
case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Farenheit) */
case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Fahrenheit) */
temp_output_c = 1;
break;
case 'u': /* ups name */

View file

@ -400,7 +400,7 @@ int phr_parse_request(const char *buf_start, size_t len, const char **method, si
*num_headers = 0;
/* if last_len != 0, check if the request is complete (a fast countermeasure
againt slowloris */
against slowloris */
if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
return r;
}
@ -435,7 +435,7 @@ static const char *parse_response(const char *buf, const char *buf_end, int *maj
}
PARSE_INT_3(status);
/* get message includig preceding space */
/* get message including preceding space */
if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) {
return NULL;
}

View file

@ -14,7 +14,7 @@
* FILE * spopen(const char *);
* int spclose(FILE *);
*
* Code taken with liitle modification from "Advanced Programming for the Unix
* Code taken with little modification from "Advanced Programming for the Unix
* Environment" by W. Richard Stevens
*
* This is considered safe in that no shell is spawned, and the environment

View file

@ -203,7 +203,7 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
}
/* parent picks up execution here */
/* close childs descriptors in our address space */
/* close children descriptors in our address space */
close(pfd[1]);
close(pfderr[1]);

View file

@ -19,19 +19,19 @@ plan skip_all => "SSH_HOST and SSH_IDENTITY must be defined" unless ($ssh_servic
plan tests => 42;
# Some random check strings/response
my @responce = ('OK: Everything is fine',
my @response = ('OK: Everything is fine',
'WARNING: Hey, pick me, pick me',
'CRITICAL: Shit happens',
'UNKNOWN: What can I do for ya',
'WOOPS: What did I smoke',
);
my @responce_re;
my @response_re;
my @check;
for (@responce) {
for (@response) {
push(@check, "echo $_");
my $re_str = $_;
$re_str =~ s{(.)} { "\Q$1" }ge;
push(@responce_re, $re_str);
push(@response_re, $re_str);
}
my $result;
@ -47,7 +47,7 @@ for (my $i=0; $i<4; $i++) {
"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[$i]; exit $i'"
);
cmp_ok($result->return_code, '==', $i, "Exit with return code $i");
is($result->output, $responce[$i], "Status text is correct for check $i");
is($result->output, $response[$i], "Status text is correct for check $i");
}
$result = NPTest->testCmd(
@ -84,7 +84,7 @@ $result = NPTest->testCmd(
"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[4]; exit 8'"
);
cmp_ok($result->return_code, '==', 8, "Exit with return code 8 (out of bounds)");
is($result->output, $responce[4], "Return proper status text even with unknown status codes");
is($result->output, $response[4], "Return proper status text even with unknown status codes");
$result = NPTest->testCmd(
"./check_by_ssh -i $ssh_key -H $ssh_service -F $ssh_conf -C 'exit 0'"
@ -108,7 +108,7 @@ my %linemap = (
foreach my $line (0, 2, 4, 6) {
my $code = $linemap{$line};
my $statline = $line+1;
is($lines[$line], "$responce[$code]", "multiple checks status text is correct for line $line");
is($lines[$line], "$response[$code]", "multiple checks status text is correct for line $line");
is($lines[$statline], "STATUS CODE: $code", "multiple check status code is correct for line $line");
}
@ -124,7 +124,7 @@ close(PASV) or die("Unable to close '/tmp/check_by_ssh.$$': $!");
cmp_ok(scalar(@pasv), '==', 1, 'One passive result for one check performed');
for (0) {
if ($pasv[$_]) {
like($pasv[$_], '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;serv;2;' . $responce_re[2] . '$/', 'proper result for passive check');
like($pasv[$_], '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;serv;2;' . $response_re[2] . '$/', 'proper result for passive check');
} else {
fail('proper result for passive check');
}
@ -144,7 +144,7 @@ for (0, 1, 2, 3, 4) {
if ($pasv[$_]) {
my $ret = $_;
$ret = 9 if ($_ == 4);
like($pasv[$_], '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;c' . $_ . ';' . $ret . ';' . $responce_re[$_] . '$/', "proper result for passive check $_");
like($pasv[$_], '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;c' . $_ . ';' . $ret . ';' . $response_re[$_] . '$/', "proper result for passive check $_");
} else {
fail("proper result for passive check $_");
}

View file

@ -326,19 +326,19 @@ cmp_ok( $result->return_code, '==', 0, "grouping: exit ok if the sum of free meg
$result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all - 1) ." -c ". ($free_mb_on_all - 1) ." -p $mountpoint_valid -g group -p $mountpoint2_valid" );
cmp_ok( $result->return_code, '==', 3, "Invalid options: -p must come after groupname");
# regex: exit unknown if given regex is not compileable
# regex: exit unknown if given regex is not compilable
$result = NPTest->testCmd( "./check_disk -w 1 -c 1 -r '('" );
cmp_ok( $result->return_code, '==', 3, "Exit UNKNOWN if regex is not compileable");
cmp_ok( $result->return_code, '==', 3, "Exit UNKNOWN if regex is not compilable");
# ignore: exit unknown, if all pathes are deselected using -i
# ignore: exit unknown, if all paths are deselected using -i
$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '$mountpoint_valid' -i '$mountpoint2_valid'" );
cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored (case sensitive)");
# ignore: exit unknown, if all pathes are deselected using -I
# ignore: exit unknown, if all paths are deselected using -I
$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -I '".uc($mountpoint_valid)."' -I '".uc($mountpoint2_valid)."'" );
cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored (case insensitive)");
# ignore: exit unknown, if all pathes are deselected using -i
# ignore: exit unknown, if all paths are deselected using -i
$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '.*'" );
cmp_ok( $result->return_code, '==', 3, "ignore-ereg: Unknown if all fs are ignored using -i '.*'");
@ -347,7 +347,7 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mo
like( $result->output, qr/$mountpoint_valid/, "output data does have $mountpoint_valid in it");
unlike( $result->output, qr/$mountpoint2_valid/, "output data does not have $mountpoint2_valid in it");
# ignore: test if all pathes are listed when ignore regex doesn't match
# ignore: test if all paths are listed when ignore regex doesn't match
$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p $mountpoint_valid -p $mountpoint2_valid -i '^barbazJodsf\$'");
like( $result->output, qr/$mountpoint_valid/, "ignore: output data does have $mountpoint_valid when regex doesn't match");
like( $result->output, qr/$mountpoint2_valid/,"ignore: output data does have $mountpoint2_valid when regex doesn't match");

View file

@ -178,13 +178,13 @@ SKIP: {
$res = NPTest->testCmd( "./$plugin -I $host_tcp_proxy -p $port_tcp_proxy -u http://$host_tcp_http -e 200,301,302");
is( $res->return_code, 0, "Proxy HTTP works");
like($res->output, qr/OK: Status line output matched/, "Proxy HTTP Output is sufficent");
like($res->output, qr/OK: Status line output matched/, "Proxy HTTP Output is sufficient");
$res = NPTest->testCmd( "./$plugin -I $host_tcp_proxy -p $port_tcp_proxy -H $host_tls_http -S -j CONNECT");
is( $res->return_code, 0, "Proxy HTTP CONNECT works");
like($res->output, qr/HTTP OK:/, "Proxy HTTP CONNECT output sufficent");
like($res->output, qr/HTTP OK:/, "Proxy HTTP CONNECT output sufficient");
$res = NPTest->testCmd( "./$plugin -I $host_tcp_proxy -p $port_tcp_proxy -H $host_tls_http -S -j CONNECT:HEAD");
is( $res->return_code, 0, "Proxy HTTP CONNECT works with override method");
like($res->output, qr/HTTP OK:/, "Proxy HTTP CONNECT output sufficent");
like($res->output, qr/HTTP OK:/, "Proxy HTTP CONNECT output sufficient");
}

View file

@ -5,7 +5,7 @@
#
#
# These are the database permissions required for this test:
# GRANT SELECT ON $db.* TO $user@$host INDENTIFIED BY '$password';
# GRANT SELECT ON $db.* TO $user@$host IDENTIFIED BY '$password';
# GRANT SUPER, REPLICATION CLIENT ON *.* TO $user@$host;
# Check with:
# mysql -u$user -p$password -h$host $db
@ -23,9 +23,9 @@ plan tests => 15;
my $bad_login_output = '/Access denied for user /';
my $mysqlserver = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no slaves setup");
my $mysqlsocket = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no slaves setup");
my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access (requires REPLICATION CLIENT privleges)", "-u test -ptest");
my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access (requires REPLICATION CLIENT privileges)", "-u test -ptest");
my $with_slave = getTestParameter("NP_MYSQL_WITH_SLAVE", "MySQL server with slaves setup");
my $with_slave_login = getTestParameter("NP_MYSQL_WITH_SLAVE_LOGIN", "Login details for server with slave (requires REPLICATION CLIENT privleges)", $mysql_login_details || "-u test -ptest");
my $with_slave_login = getTestParameter("NP_MYSQL_WITH_SLAVE_LOGIN", "Login details for server with slave (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
my $result;

View file

@ -31,7 +31,7 @@ $result = NPTest->testCmd("./check_mysql_query -q 'SELECT 1+1' -H $mysqlserver $
cmp_ok( $result->return_code, '==', 0, "Can run query");
$result = NPTest->testCmd("./check_mysql_query -H $mysqlserver $mysql_login_details");
cmp_ok( $result->return_code, '==', 3, "Missing query parmeter");
cmp_ok( $result->return_code, '==', 3, "Missing query parameter");
like( $result->output, "/Must specify a SQL query to run/", "Missing query error message");
$result = NPTest->testCmd("./check_mysql_query -q 'SELECT 1+1' -H $mysqlserver -u dummy -d mysql");

View file

@ -36,7 +36,7 @@ cmp_ok( $result->return_code, '==', 1, "Log over 5 minutes old" );
like ( $result->output, $warningOutput, "Output for warning correct" );
my $now = time;
# This substitution is dependant on the testcase
# This substitution is dependent on the testcase
system( "perl -pe 's/1133537544/$now/' $nagios1 > $nagios1.tmp" ) == 0 or die "Problem with munging $nagios1";
$result = NPTest->testCmd(

View file

@ -84,7 +84,7 @@ foreach my $current_state (keys(%state)) {
foreach my $new_state (keys(%state)) {
$res = NPTest->testCmd( "./negate -s --$current_state=$new_state ./check_dummy ".$state{$current_state}." 'Fake $new_state'" );
is( $res->return_code, $state{$new_state}, "Got fake $new_state (with substitute)" );
is( $res->output, uc($new_state).": Fake $new_state", "Substitued fake $new_state output");
is( $res->output, uc($new_state).": Fake $new_state", "Substituted fake $new_state output");
}
}

View file

@ -53,7 +53,7 @@ if ($pid) {
#print "child\n";
print "Please contact SNMP at: $port_snmp\n";
close(STDERR); # Coment out to debug snmpd problems (most errors sent there are OK)
close(STDERR); # Comment out to debug snmpd problems (most errors sent there are OK)
exec("snmpd -c tests/conf/snmpd.conf -C -f -r udp:$port_snmp");
}
@ -227,7 +227,7 @@ is($res->output, 'SNMP OK - "555\"I said\"" | ', "Check string with a double quo
$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.15 -r 'CUSTOM CHECK OK'" );
is($res->return_code, 0, "String check should check whole string, not a parsed number" );
is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check witn numbers returns whole string");
is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check with numbers returns whole string");
$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
is($res->return_code, 0, "Negative integer check OK" );

View file

@ -7,7 +7,7 @@
/* The purpose of this package is to provide safer alternatives to C
functions that might otherwise be vulnerable to hacking. This
currently includes a standard suite of validation routines to be sure
that an string argument acually converts to its intended type and a
that an string argument actually converts to its intended type and a
suite of string handling routine that do their own memory management
in order to resist overflow attacks. In addition, a few functions are
provided to standardize version and error reporting across the entire

View file

@ -936,12 +936,12 @@ msgstr ""
#: plugins/check_fping.c:422
#, c-format
msgid "%s: Only one threshold may be packet loss (%s)\n"
msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n"
msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
#: plugins/check_fping.c:426
#, c-format
msgid "%s: Only one threshold must be packet loss (%s)\n"
msgstr "%s: Nur ein Wert darf für paket loss angegeben werden (%s)\n"
msgstr "%s: Nur ein Wert darf für packet loss angegeben werden (%s)\n"
#: plugins/check_fping.c:458
msgid ""
@ -4299,7 +4299,7 @@ msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr "Dieses plugin testet Gameserververbindungen zum angegebenen Host."
#: plugins/check_real.c:438 plugins/check_smtp.c:830
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgid "Successful connects return STATE_OK, refusals and timeouts return"
msgstr ""
#: plugins/check_real.c:439
@ -4721,7 +4721,7 @@ msgid ""
msgstr ""
#: plugins/check_snmp.c:1143
msgid "Add/substract the specified OFFSET to numeric sensor data"
msgid "Add/subtract the specified OFFSET to numeric sensor data"
msgstr ""
#: plugins/check_snmp.c:1147
@ -4943,7 +4943,7 @@ msgid ""
msgstr ""
#: plugins/check_swap.c:541
msgid "Exit with CRITCAL status if less than PERCENT of swap space is free"
msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
msgstr ""
#: plugins/check_swap.c:543
@ -6372,7 +6372,7 @@ msgstr ""
#~ " Exit with CRITICAL status if less than INTEGER --units of disk are "
#~ "free\n"
#~ " -c, --critical=PERCENT%%\n"
#~ " Exit with CRITCAL status if less than PERCENT of disk space is free\n"
#~ " Exit with CRITICAL status if less than PERCENT of disk space is free\n"
#~ " -C, --clear\n"
#~ " Clear thresholds\n"
#~ msgstr ""

View file

@ -4372,7 +4372,7 @@ msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr "Ce plugin va essayer d'ouvrir un connexion RTSP avec l'hôte."
#: plugins/check_real.c:438 plugins/check_smtp.c:830
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgid "Successful connects return STATE_OK, refusals and timeouts return"
msgstr ""
#: plugins/check_real.c:439
@ -4784,7 +4784,7 @@ msgid ""
msgstr ""
#: plugins/check_snmp.c:1143
msgid "Add/substract the specified OFFSET to numeric sensor data"
msgid "Add/subtract the specified OFFSET to numeric sensor data"
msgstr ""
#: plugins/check_snmp.c:1147
@ -5021,7 +5021,7 @@ msgstr ""
"sont libres"
#: plugins/check_swap.c:541
msgid "Exit with CRITCAL status if less than PERCENT of swap space is free"
msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
msgstr ""
"Sortir avec un résultat CRITIQUE si moins de X pour cent de mémoire "
"virtuelle est libre"

View file

@ -4193,7 +4193,7 @@ msgid "This plugin will attempt to open an RTSP connection with the host."
msgstr ""
#: plugins/check_real.c:438 plugins/check_smtp.c:830
msgid "Successul connects return STATE_OK, refusals and timeouts return"
msgid "Successful connects return STATE_OK, refusals and timeouts return"
msgstr ""
#: plugins/check_real.c:439
@ -4597,7 +4597,7 @@ msgid ""
msgstr ""
#: plugins/check_snmp.c:1143
msgid "Add/substract the specified OFFSET to numeric sensor data"
msgid "Add/subtract the specified OFFSET to numeric sensor data"
msgstr ""
#: plugins/check_snmp.c:1147
@ -4817,7 +4817,7 @@ msgid ""
msgstr ""
#: plugins/check_swap.c:541
msgid "Exit with CRITCAL status if less than PERCENT of swap space is free"
msgid "Exit with CRITICAL status if less than PERCENT of swap space is free"
msgstr ""
#: plugins/check_swap.c:543

View file

@ -291,7 +291,7 @@ always returns 0.
.Xc
.El
.Pp
For maximum compatability your test program should return a particular
For maximum compatibility your test program should return a particular
exit code. This is calculated by
.Fn exit_status
so it is sufficient to always return from
@ -309,7 +309,7 @@ directory in the source distribution contains numerous tests of
functionality, written using
.Nm .
Examine them for examples of how to construct test suites.
.Sh COMPATABILITY
.Sh COMPATIBILITY
.Nm
strives to be compatible with the Perl Test::More and Test::Harness
modules. The test suite verifies that

View file

@ -25,7 +25,7 @@
*/
/* '## __VA_ARGS__' is a gcc'ism. C99 doesn't allow the token pasting
and requires the caller to add the final comma if they've ommitted
and requires the caller to add the final comma if they've omitted
the optional arguments */
#ifdef __GNUC__
# define ok(e, test, ...) ((e) ? \

View file

@ -140,7 +140,7 @@ my $libs = "$destdir/$prefix/lib:$destdir/$prefix/lib/$Config{archname}";
my $topdir = cwd();
# set an initial value if there isnt one already
# set an initial value if there isn't one already
# Need to use PERL5LIB to ensure we get pre-installed mods from earlier
# tags in the install_order file
$ENV{PERL5LIB} ||= q{};
@ -149,8 +149,8 @@ $ENV{PERL5LIB} ||= q{};
$ENV{PERL_AUTOINSTALL} = "--skipdeps";
# keep a record of how many times a module build is done. This is so they may
# be built a second time to include optional prereq's that couldnt
# previously be built due to circular dependancies
# be built a second time to include optional prereq's that couldn't
# previously be built due to circular dependencies
my %built_modules;
foreach my $tarball (@tarballs) {
( my $dir = $tarball ) =~ s/\.(?:tgz|tar.gz)$//;

View file

@ -2,7 +2,7 @@
#
# Hacked version of the sample code from the perlembedded doco.
#
# Only major changes are to separate the compiling and cacheing from
# Only major changes are to separate the compiling and caching from
# the execution so that the cache can be kept in "non-volatile" parent
# process while the execution is done from "volatile" child processes
# and that STDOUT is redirected to a file by means of a tied filehandle

View file

@ -138,7 +138,7 @@ sub BuildIt {
# interprets that as the end of the mail, and truncates the log before
# it gets to Tinderbox. (terry weismann, chris yeh)
#
# This was replaced by a perl 'port' of the above, writen by
# This was replaced by a perl 'port' of the above, written by
# preed@netscape.com; good things: no need for system() call, and now it's
# all in perl, so we don't have to do OS checking like before.