![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5dc0b02)
raw | patch | inline | side by side (parent: 5dc0b02)
| author | Benoit Mortier <opensides@users.sourceforge.net> | |
| Wed, 1 Dec 2004 19:33:45 +0000 (19:33 +0000) | ||
| committer | Benoit Mortier <opensides@users.sourceforge.net> | |
| Wed, 1 Dec 2004 19:33:45 +0000 (19:33 +0000) |
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@962 f882894a-f735-0410-b71e-b25c423dba1c
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 9500cb3d464b74f2386579d695d2bad21c7f61f1..6daa1a11bd60128d1206cfe93bba730cb272bc91 100644 (file)
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
return result;
}
-
-
-
-
-\f
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
break;
case 'H': /* host */
if (!is_host (optarg))
- usage2 (_("Invalid host name"), optarg);
+ usage2 (_("Invalid hostname/adress"), optarg);
hostname = optarg;
break;
case 'p': /* port number */
if (!is_integer (optarg))
- usage2 (_("port must be an integer"), optarg);
+ usage2 (_("port must be a positive integer"), optarg);
asprintf (&comm,"%s -p %s", comm, optarg);
break;
case 'O': /* output file */
}
-
-
-
-\f
void
print_help (void)
{
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index 92a5eda89366d7e63b65a1b9472b150b2140cc85..5b472ecaac040cb158a38a12d7db7365096f7720 100644 (file)
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
if (spclose (child_process)) {
result = max_state (result, STATE_WARNING);
if (strlen (output) == 0)
- asprintf (&output, _("dig returned error status"));
+ asprintf (&output, _("dig returned an error status"));
}
microsec = deltime (tv);
-\f
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
dns_server = optarg;
}
else {
- usage2 (_("Invalid host name"), optarg);
+ usage2 (_("Invalid hostname/adress"), optarg);
}
break;
case 'p': /* server port */
server_port = atoi (optarg);
}
else {
- usage2 (_("Server port must be a nonnegative integer"), optarg);
+ usage2 (_("port must be a positive integer"), optarg);
}
break;
case 'l': /* address to lookup */
warning_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Warning interval must be a nonnegative integer"), optarg);
+ usage2 (_("Warning interval must be a positive integer"), optarg);
}
break;
case 'c': /* critical */
critical_interval = strtod (optarg, NULL);
}
else {
- usage2 (_("Critical interval must be a nonnegative integer"), optarg);
+ usage2 (_("Critical interval must be a positive integer"), optarg);
}
break;
case 't': /* timeout */
timeout_interval = atoi (optarg);
}
else {
- usage2 (_("Time interval must be a nonnegative integer"), optarg);
+ usage2 (_("Timeout interval must be a positive integer"), optarg);
}
break;
case 'v': /* verbose */
dns_server = argv[c];
}
else {
- usage2 (_("Invalid host name"), argv[c]);
+ usage2 (_("Invalid hostname/adress"), argv[c]);
}
}
else {
-\f
void
print_help (void)
{
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 95e84751275f3458ae18bc4ff1051ef220f15834..c823925011cd4cffa089357be374da46dd8de930 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
print_help ();
exit (STATE_OK);
case '?': /* help */
- usage (_("check_disk: unrecognized option\n"));
+ usage (_("Unknow argument\n"));
break;
}
}
-\f
void
print_help (void)
{
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 7b18270f67d1083829e58132af6f923204df8580..6c08c2776e558ec3cee998d0a7afc49c99add4e6 100644 (file)
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
printf (_("DNS CRITICAL - %s\n"),
!strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
else
- printf (_("DNS problem - %s\n"),
+ printf (_("DNS UNKNOW - %s\n"),
!strcmp (output, "") ? _(" Probably a non-existent host/domain") : output);
return result;
case 'r': /* reverse server name */
/* TODO: Is this is_host necessary? */
if (is_host (optarg) == FALSE) {
- usage2 (_("Invalid host name/address"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
}
if (strlen (optarg) >= ADDRESS_LENGTH)
die (STATE_UNKNOWN, _("Input buffer overflow\n"));
if (strlen(dns_server)==0 && c<argc) {
/* TODO: See -s option */
if (is_host(argv[c]) == FALSE) {
- printf (_("Invalid name/address: %s\n\n"), argv[c]);
+ printf (_("Invalid hostname/address: %s\n\n"), argv[c]);
return ERROR;
}
if (strlen(argv[c]) >= ADDRESS_LENGTH)
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 22f6b55d4f9591ee21a7a051552b30b3a31d9491..2dba2d58400bf1079978d7e142964b2b2f56cc5d 100644 (file)
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
int status = STATE_UNKNOWN;
if (strstr (buf, "not found")) {
- die (STATE_CRITICAL, _("FPING unknown - %s not found\n"), server_name);
+ die (STATE_CRITICAL, _("FPING UNKNOW - %s not found\n"), server_name);
}
else if (strstr (buf, "is unreachable") || strstr (buf, "Unreachable")) {
- die (STATE_CRITICAL, _("FPING critical - %s is unreachable\n"),
+ die (STATE_CRITICAL, _("FPING CRITICAL - %s is unreachable\n"),
"host");
}
else if (strstr (buf, "is down")) {
- die (STATE_CRITICAL, _("FPING critical - %s is down\n"), server_name);
+ die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
}
else if (strstr (buf, "is alive")) {
break;
case 'H': /* hostname */
if (is_host (optarg) == FALSE) {
- usage2 (_("Invalid host name/address"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
}
server_name = strscpy (server_name, optarg);
break;
if (server_name == NULL)
- usage (_("Host name was not supplied\n\n"));
+ usage (_("Hostname was not supplied\n\n"));
return OK;
}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 86267b29c85290804c65f5c9800f6e55e7392252..ea74fa8865939a29c71b925b2993e20801650cbc 100644 (file)
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
switch (c) {
case '?': /* help */
- usage ("");
+ usage (_("Unknow argument\n"));
+ break;
case 'V': /* version */
print_revision (progname, revision);
exit (STATE_OK);
break;
case 'H': /* host */
if (is_host (optarg) == FALSE)
- usage2 (_("Invalid host name/address"), optarg);
+ usage2 (_("Invalid hostname/address"), optarg);
server_name = optarg;
break;
case 'p': /* port */
printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
printf (COPYRIGHT, copyright, email);
- printf (_("Try to connect to SSH server at specified server and port\n\n"));
+ printf (_("Try to connect to an SSH server at specified server and port\n\n"));
print_usage ();