diff options
-rw-r--r-- | plugins/check_disk.c | 2 | ||||
-rw-r--r-- | plugins/check_smtp.c | 6 | ||||
-rw-r--r-- | plugins/check_ups.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index ab9f66f..512344d 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
@@ -19,7 +19,7 @@ | |||
19 | *****************************************************************************/ | 19 | *****************************************************************************/ |
20 | 20 | ||
21 | const char *progname = "check_disk"; | 21 | const char *progname = "check_disk"; |
22 | const char *program_name = "check_disk"; // Required for coreutils libs | 22 | const char *program_name = "check_disk"; /* Required for coreutils libs */ |
23 | const char *revision = "$Revision$"; | 23 | const char *revision = "$Revision$"; |
24 | const char *copyright = "1999-2004"; | 24 | const char *copyright = "1999-2004"; |
25 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; | 25 | const char *email = "nagiosplug-devel@lists.sourceforge.net"; |
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 3b0e469..f23e5d0 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
@@ -182,7 +182,7 @@ main (int argc, char **argv) | |||
182 | /* send the STARTTLS command */ | 182 | /* send the STARTTLS command */ |
183 | send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); | 183 | send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); |
184 | 184 | ||
185 | recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); // wait for it | 185 | recv(sd,buffer, MAX_INPUT_BUFFER-1, 0); /* wait for it */ |
186 | if (!strstr (buffer, server_expect)) { | 186 | if (!strstr (buffer, server_expect)) { |
187 | printf (_("Server does not support STARTTLS\n")); | 187 | printf (_("Server does not support STARTTLS\n")); |
188 | return STATE_UNKNOWN; | 188 | return STATE_UNKNOWN; |
@@ -254,8 +254,6 @@ main (int argc, char **argv) | |||
254 | if (n < nresponses) { | 254 | if (n < nresponses) { |
255 | #ifdef HAVE_REGEX_H | 255 | #ifdef HAVE_REGEX_H |
256 | cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE; | 256 | cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE; |
257 | //strncpy (regex_expect, responses[n], sizeof (regex_expect) - 1); | ||
258 | //regex_expect[sizeof (regex_expect) - 1] = '\0'; | ||
259 | errcode = regcomp (&preg, responses[n], cflags); | 257 | errcode = regcomp (&preg, responses[n], cflags); |
260 | if (errcode != 0) { | 258 | if (errcode != 0) { |
261 | regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER); | 259 | regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER); |
@@ -610,7 +608,7 @@ connect_STARTTLS (void) | |||
610 | /* this causes a seg faul | 608 | /* this causes a seg faul |
611 | not sure why, being sloppy | 609 | not sure why, being sloppy |
612 | and commenting it out */ | 610 | and commenting it out */ |
613 | // SSL_free (ssl); | 611 | /* SSL_free (ssl); */ |
614 | SSL_CTX_free(ctx); | 612 | SSL_CTX_free(ctx); |
615 | my_close(); | 613 | my_close(); |
616 | 614 | ||
diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 1cdf9e9..e11332f 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c | |||
@@ -408,7 +408,7 @@ get_ups_variable (const char *varname, char *buf, size_t buflen) | |||
408 | } | 408 | } |
409 | 409 | ||
410 | if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) { | 410 | if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) { |
411 | //printf ("Error: Variable '%s' is not supported\n", varname); | 411 | /*printf ("Error: Variable '%s' is not supported\n", varname);*/ |
412 | return NOSUCHVAR; | 412 | return NOSUCHVAR; |
413 | } | 413 | } |
414 | 414 | ||