X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_http.c;h=4734d75c5c43b4fde66490986f89046399424786;hb=11b35b92e3195d230bef359f6a0679ae4414716b;hp=de7a2db7f7b70b70d3917874ddca0a2908df03fc;hpb=0c3386274ef5002dffc20337ef02407f24d7400c;p=nagiosplug.git diff --git a/plugins/check_http.c b/plugins/check_http.c index de7a2db..4734d75 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -41,11 +41,11 @@ strings and regular expressions, check connection times, and report on\n\ certificate expiration times.\n" #define OPTIONS "\ -\(-H | -I ) [-u ] [-p ]\n\ +(-H | -I ) [-u ] [-p ]\n\ [-w ] [-c ] [-t ] [-L]\n\ [-a auth] [-f ] [-e ]\n\ - [-s string] [-r | -R ]\n\ - [-P string]" + [-s string] [-l] [-r | -R ]\n\ + [-P string] [-m min_pg_size]" #define LONGOPTIONS "\ -H, --hostname=ADDRESS\n\ @@ -74,7 +74,9 @@ certificate expiration times.\n" -L, --link=URL\n\ Wrap output in HTML link (obsoleted by urlize)\n\ -f, --onredirect=\n\ - How to handle redirected pages\n%s\ + How to handle redirected pages\n%s%s\ +-m, --min=INTEGER\n\ + Minimum page size required (bytes)\n\ -v, --verbose\n\ Show details for command-line debugging (do not use with nagios server)\n\ -h, --help\n\ @@ -93,6 +95,18 @@ certificate expiration times.\n" #define SSLOPTIONS "" #endif +#ifdef HAVE_REGEX_H +#define REGOPTIONS "\ + -l, --linespan\n\ + Allow regex to span newlines (must precede -r or -R)\n\ + -r, --regex, --ereg=STRING\n\ + Search page for regex STRING\n\ + -R, --eregi=STRING\n\ + Search page for case-insensitive regex STRING\n" +#else +#define REGOPTIONS "" +#endif + #define DESCRIPTION "\ This plugin will attempt to open an HTTP connection with the host. Successul\n\ connects return STATE_OK, refusals and timeouts return STATE_CRITICAL, other\n\ @@ -139,7 +153,7 @@ the certificate is expired.\n" #ifdef HAVE_SSL int check_cert = FALSE; int days_till_exp; -unsigned char *randbuff; +char *randbuff = ""; SSL_CTX *ctx; SSL *ssl; X509 *server_cert; @@ -148,8 +162,10 @@ int check_certificate (X509 **); #endif #ifdef HAVE_REGEX_H -#define REGS 2 -#define MAX_RE_SIZE 256 +enum { + REGS = 2, + MAX_RE_SIZE = 256 +}; #include regex_t preg; regmatch_t pmatch[REGS]; @@ -166,27 +182,31 @@ struct timeval tv; #define server_port_check(use_ssl) (use_ssl ? HTTPS_PORT : HTTP_PORT) -#define MAX_IPV4_HOSTLENGTH 64 #define HDR_LOCATION "%*[Ll]%*[Oo]%*[Cc]%*[Aa]%*[Tt]%*[Ii]%*[Oo]%*[Nn]: " #define URI_HTTP "%[HTPShtps]://" #define URI_HOST "%[a-zA-Z0-9.-]" #define URI_PORT ":%[0-9]" #define URI_PATH "%[/a-zA-Z0-9._-=@,]" -#define HTTP_PORT 80 -#define HTTPS_PORT 443 +enum { + MAX_IPV4_HOSTLENGTH = 64, + HTTP_PORT = 80, + HTTPS_PORT = 443 +}; + #define HTTP_EXPECT "HTTP/1." #define HTTP_URL "/" +#define CRLF "\r\n" char timestamp[17] = ""; int specify_port = FALSE; int server_port = HTTP_PORT; char server_port_text[6] = ""; char server_type[6] = "http"; -/*@null@*/ char *server_address = NULL; -/*@null@*/ char *host_name = NULL; -/*@null@*/ char *server_url = NULL; -int server_url_length = 0; +char *server_address = ""; +char *host_name = ""; +char *server_url = ""; +int server_url_length; int server_expect_yn = 0; char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT; char string_expect[MAX_INPUT_BUFFER] = ""; @@ -200,8 +220,9 @@ int onredirect = STATE_OK; int use_ssl = FALSE; int verbose = FALSE; int sd; -/*@null@*/ char *http_method = NULL; -/*@null@*/ char *http_post_data = NULL; +int min_page_len = 0; +char *http_method = "GET"; +char *http_post_data = ""; char buffer[MAX_INPUT_BUFFER]; void print_usage (void); @@ -217,6 +238,10 @@ main (int argc, char **argv) { int result = STATE_UNKNOWN; + /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */ + asprintf (&server_url, "%s", HTTP_URL); + server_url_length = strlen(server_url); + if (process_arguments (argc, argv) == ERROR) usage ("check_http: could not parse arguments\n"); @@ -271,7 +296,6 @@ process_arguments (int argc, char **argv) { int c = 1; -#ifdef HAVE_GETOPT_H int option_index = 0; static struct option long_options[] = { STD_LONG_OPTS, @@ -286,11 +310,12 @@ process_arguments (int argc, char **argv) {"regex", required_argument, 0, 'r'}, {"ereg", required_argument, 0, 'r'}, {"eregi", required_argument, 0, 'R'}, + {"linespan", no_argument, 0, 'l'}, {"onredirect", required_argument, 0, 'f'}, {"certificate", required_argument, 0, 'C'}, + {"min", required_argument, 0, 'm'}, {0, 0, 0, 0} }; -#endif if (argc < 2) return ERROR; @@ -308,14 +333,8 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-n"); } -#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nLS" - while (1) { -#ifdef HAVE_GETOPT_H - c = getopt_long (argc, argv, OPTCHARS, long_options, &option_index); -#else - c = getopt (argc, argv, OPTCHARS); -#endif + c = getopt_long (argc, argv, "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLSm:", long_options, &option_index); if (c == -1 || c == EOF) break; @@ -388,14 +407,14 @@ process_arguments (int argc, char **argv) break; /* Note: H, I, and u must be malloc'd or will fail on redirects */ case 'H': /* Host Name (virtual host) */ - host_name = strscpy (host_name, optarg); + asprintf (&host_name, "%s", optarg); break; case 'I': /* Server IP-address */ - server_address = strscpy (server_address, optarg); + asprintf (&server_address, "%s", optarg); break; case 'u': /* Host or server */ - server_url = strscpy (server_url, optarg); - server_url_length = strlen (optarg); + asprintf (&server_url, "%s", optarg); + server_url_length = strlen (server_url); break; case 'p': /* Host or server */ if (!is_intnonneg (optarg)) @@ -408,8 +427,8 @@ process_arguments (int argc, char **argv) user_auth[MAX_INPUT_BUFFER - 1] = 0; break; case 'P': /* HTTP POST data in URL encoded format */ - http_method = strscpy (http_method, "POST"); - http_post_data = strscpy (http_post_data, optarg); + asprintf (&http_method, "%s", "POST"); + asprintf (&http_post_data, "%s", optarg); break; case 's': /* string or substring */ strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1); @@ -420,15 +439,19 @@ process_arguments (int argc, char **argv) server_expect[MAX_INPUT_BUFFER - 1] = 0; server_expect_yn = 1; break; - case 'R': /* regex */ -#ifdef HAVE_REGEX_H - cflags = REG_ICASE; -#else +#ifndef HAVE_REGEX_H + case 'l': /* linespan */ + case 'r': /* linespan */ + case 'R': /* linespan */ usage ("check_http: call for regex which was not a compiled option\n"); -#endif + break; +#else + case 'l': /* linespan */ + cflags &= ~REG_NEWLINE; + break; + case 'R': /* regex */ + cflags |= REG_ICASE; case 'r': /* regex */ -#ifdef HAVE_REGEX_H - cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE; strncpy (regexp, optarg, MAX_RE_SIZE - 1); regexp[MAX_RE_SIZE - 1] = 0; errcode = regcomp (&preg, regexp, cflags); @@ -437,38 +460,30 @@ process_arguments (int argc, char **argv) printf ("Could Not Compile Regular Expression: %s", errbuf); return ERROR; } -#else - usage ("check_http: call for regex which was not a compiled option\n"); -#endif break; +#endif case 'v': /* verbose */ verbose = TRUE; break; + case 'm': /* min_page_length */ + min_page_len = atoi (optarg); + break; } } c = optind; - if (server_address == NULL && host_name == NULL) { - server_address = strscpy (NULL, argv[c]); - host_name = strscpy (NULL, argv[c++]); - } - - if (server_address == NULL && host_name == NULL) - usage ("check_http: you must specify a host name\n"); + if (strcmp (server_address, "") == 0 && c < argc) + asprintf (&server_address, "%s", argv[c++]); - if (server_address == NULL) - server_address = strscpy (NULL, host_name); + if (strcmp (host_name, "") == 0 && c < argc) + asprintf (&host_name, "%s", argv[c++]); - if (host_name == NULL) - host_name = strscpy (NULL, server_address); - - if (http_method == NULL) - http_method = strscpy (http_method, "GET"); - - if (server_url == NULL) { - server_url = strscpy (NULL, "/"); - server_url_length = strlen(HTTP_URL); + if (strcmp (server_address ,"") == 0) { + if (strcmp (host_name, "") == 0) + usage ("check_http: you must specify a server address or host name\n"); + else + asprintf (&server_address, "%s", host_name); } return TRUE; @@ -534,13 +549,18 @@ check_http (void) char *x = NULL; char *orig_url = NULL; double elapsed_time; + int page_len = 0; +#ifdef HAVE_SSL + int sslerr; +#endif /* try to connect to the host at the given port number */ #ifdef HAVE_SSL if (use_ssl == TRUE) { - if (connect_SSL () != OK) + if (connect_SSL () != OK) { terminate (STATE_CRITICAL, "Unable to open TCP socket"); + } if ((server_cert = SSL_get_peer_certificate (ssl)) != NULL) { X509_free (server_cert); @@ -550,107 +570,51 @@ check_http (void) return STATE_CRITICAL; } - asprintf (&buf, "%s %s HTTP/1.0\r\n", http_method, server_url); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } + } + else { +#endif + if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK) + terminate (STATE_CRITICAL, "Unable to open TCP socket"); +#ifdef HAVE_SSL + } +#endif - /* optionally send the host header info (not clear if it's usable) */ - if (strcmp (host_name, "")) { - asprintf (&buf, "Host: %s\r\n", host_name); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } - } + asprintf (&buf, "%s %s HTTP/1.0\r\n", http_method, server_url); - /* send user agent */ - asprintf (&buf, "User-Agent: check_http/%s (nagios-plugins %s)\r\n", - clean_revstring (REVISION), PACKAGE_VERSION); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } + /* optionally send the host header info (not clear if it's usable) */ + if (strcmp (host_name, "")) + asprintf (&buf, "%sHost: %s\r\n", buf, host_name); - /* optionally send the authentication info */ - if (strcmp (user_auth, "")) { - auth = base64 (user_auth, strlen (user_auth)); - asprintf (&buf, "Authorization: Basic %s\r\n", auth); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } - } + /* send user agent */ + asprintf (&buf, "%sUser-Agent: check_http/%s (nagios-plugins %s)\r\n", + buf, clean_revstring (REVISION), PACKAGE_VERSION); - /* optionally send http POST data */ - if (http_post_data) { - asprintf (&buf, "Content-Type: application/x-www-form-urlencoded\r\n"); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } - asprintf (&buf, "Content-Length: %i\r\n\r\n", strlen (http_post_data)); - if (SSL_write (ssl, buf, strlen (buf)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } - http_post_data = strscat (http_post_data, "\r\n"); - if (SSL_write (ssl, http_post_data, strlen (http_post_data)) == -1) { - ERR_print_errors_fp (stderr); - return STATE_CRITICAL; - } - } + /* optionally send the authentication info */ + if (strcmp (user_auth, "")) { + auth = base64 (user_auth, strlen (user_auth)); + asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth); + } + + /* either send http POST data */ + if (strlen (http_post_data)) { + asprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf); + asprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, strlen (http_post_data)); + asprintf (&buf, "%s%s%s", buf, http_post_data, CRLF); + } + else { + /* or just a newline so the server knows we're done with the request */ + asprintf (&buf, "%s%s", buf, CRLF); + } - /* send a newline so the server knows we're done with the request */ - asprintf (&buf, "\r\n\r\n"); +#ifdef HAVE_SSL + if (use_ssl == TRUE) { if (SSL_write (ssl, buf, strlen (buf)) == -1) { ERR_print_errors_fp (stderr); return STATE_CRITICAL; } - } else { #endif - if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK) - terminate (STATE_CRITICAL, "Unable to open TCP socket"); - asprintf (&buf, "%s %s HTTP/1.0\r\n", http_method, server_url); - send (sd, buf, strlen (buf), 0); - - - - /* optionally send the host header info */ - if (strcmp (host_name, "")) { - asprintf (&buf, "Host: %s\r\n", host_name); - send (sd, buf, strlen (buf), 0); - } - - /* send user agent */ - asprintf (&buf, - "User-Agent: check_http/%s (nagios-plugins %s)\r\n", - clean_revstring (REVISION), PACKAGE_VERSION); - send (sd, buf, strlen (buf), 0); - - /* optionally send the authentication info */ - if (strcmp (user_auth, "")) { - auth = base64 (user_auth, strlen (user_auth)); - asprintf (&buf, "Authorization: Basic %s\r\n", auth); - send (sd, buf, strlen (buf), 0); - } - - /* optionally send http POST data */ - /* written by Chris Henesy */ - if (http_post_data) { - asprintf (&buf, "Content-Type: application/x-www-form-urlencoded\r\n"); - send (sd, buf, strlen (buf), 0); - asprintf (&buf, "Content-Length: %i\r\n\r\n", strlen (http_post_data)); - send (sd, buf, strlen (buf), 0); - http_post_data = strscat (http_post_data, "\r\n"); - send (sd, http_post_data, strlen (http_post_data), 0); - } - - /* send a newline so the server knows we're done with the request */ - asprintf (&buf, "\r\n"); send (sd, buf, strlen (buf), 0); #ifdef HAVE_SSL } @@ -663,8 +627,18 @@ check_http (void) pagesize += i; } - if (i < 0) + if (i < 0) { +#ifdef HAVE_SSL + sslerr=SSL_get_error(ssl, i); + if ( sslerr == SSL_ERROR_SSL ) { + terminate (STATE_WARNING, "Client Certificate Required\n"); + } else { + terminate (STATE_CRITICAL, "Error in recv()"); + } +#else terminate (STATE_CRITICAL, "Error in recv()"); +#endif + } /* return a CRITICAL status if we couldn't read any data */ if (pagesize == (size_t) 0) @@ -757,7 +731,7 @@ check_http (void) strstr (status_line, "304")) { if (onredirect == STATE_DEPENDENT) { - orig_url = strscpy(NULL, server_url); + asprintf (&orig_url, "%s", server_url); pos = header; while (pos) { server_address = realloc (server_address, MAX_IPV4_HOSTLENGTH); @@ -772,26 +746,26 @@ check_http (void) server_url_length = strcspn (pos, "\r\n"); } if (sscanf (pos, HDR_LOCATION URI_HTTP URI_HOST URI_PORT URI_PATH, server_type, server_address, server_port_text, server_url) == 4) { - host_name = strscpy (host_name, server_address); + asprintf (&host_name, "%s", server_address); use_ssl = server_type_check (server_type); server_port = atoi (server_port_text); check_http (); } else if (sscanf (pos, HDR_LOCATION URI_HTTP URI_HOST URI_PATH, server_type, server_address, server_url) == 3 ) { - host_name = strscpy (host_name, server_address); + asprintf (&host_name, "%s", server_address); use_ssl = server_type_check (server_type); server_port = server_port_check (use_ssl); check_http (); } else if (sscanf (pos, HDR_LOCATION URI_HTTP URI_HOST URI_PORT, server_type, server_address, server_port_text) == 3) { - host_name = strscpy (host_name, server_address); + asprintf (&host_name, "%s", server_address); strcpy (server_url, "/"); use_ssl = server_type_check (server_type); server_port = atoi (server_port_text); check_http (); } else if (sscanf (pos, HDR_LOCATION URI_HTTP URI_HOST, server_type, server_address) == 2) { - host_name = strscpy (host_name, server_address); + asprintf (&host_name, "%s", server_address); strcpy (server_url, "/"); use_ssl = server_type_check (server_type); server_port = server_port_check (use_ssl); @@ -807,21 +781,21 @@ check_http (void) pos += (size_t) strcspn (pos, "\r\n"); pos += (size_t) strspn (pos, "\r\n"); } /* end while (pos) */ - printf ("HTTP UNKNOWN: Could not find redirect location - %s%s", + printf ("UNKNOWN - Could not find redirect location - %s%s", status_line, (display_html ? "" : "")); exit (STATE_UNKNOWN); } /* end if (onredirect == STATE_DEPENDENT) */ else if (onredirect == STATE_UNKNOWN) - printf ("HTTP UNKNOWN"); + printf ("UNKNOWN"); else if (onredirect == STATE_OK) - printf ("HTTP ok"); + printf ("OK"); else if (onredirect == STATE_WARNING) - printf ("HTTP WARNING"); + printf ("WARNING"); else if (onredirect == STATE_CRITICAL) - printf ("HTTP CRITICAL"); + printf ("CRITICAL"); elapsed_time = delta_time (tv); - asprintf (&msg, ": %s - %7.3f second response time %s%s|time=%7.3f\n", + asprintf (&msg, " - %s - %.3f second response time %s%s|time=%.3f\n", status_line, elapsed_time, timestamp, (display_html ? "" : ""), elapsed_time); terminate (onredirect, msg); @@ -833,7 +807,7 @@ check_http (void) /* check elapsed time */ elapsed_time = delta_time (tv); - asprintf (&msg, "HTTP problem: %s - %7.3f second response time %s%s|time=%7.3f\n", + asprintf (&msg, "HTTP problem: %s - %.3f second response time %s%s|time=%.3f\n", status_line, elapsed_time, timestamp, (display_html ? "" : ""), elapsed_time); if (check_critical_time == TRUE && elapsed_time > critical_time) @@ -846,13 +820,13 @@ check_http (void) if (strlen (string_expect)) { if (strstr (page, string_expect)) { - printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n", + printf ("HTTP OK %s - %.3f second response time %s%s|time=%.3f\n", status_line, elapsed_time, timestamp, (display_html ? "" : ""), elapsed_time); exit (STATE_OK); } else { - printf ("HTTP CRITICAL: string not found%s|time=%7.3f\n", + printf ("CRITICAL - string not found%s|time=%.3f\n", (display_html ? "" : ""), elapsed_time); exit (STATE_CRITICAL); } @@ -861,28 +835,35 @@ check_http (void) if (strlen (regexp)) { errcode = regexec (&preg, page, REGS, pmatch, 0); if (errcode == 0) { - printf ("HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n", + printf ("HTTP OK %s - %.3f second response time %s%s|time=%.3f\n", status_line, elapsed_time, timestamp, (display_html ? "" : ""), elapsed_time); exit (STATE_OK); } else { if (errcode == REG_NOMATCH) { - printf ("HTTP CRITICAL: pattern not found%s|time=%7.3f\n", + printf ("CRITICAL - pattern not found%s|time=%.3f\n", (display_html ? "" : ""), elapsed_time); exit (STATE_CRITICAL); } else { regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER); - printf ("Execute Error: %s\n", errbuf); + printf ("CRITICAL - Execute Error: %s\n", errbuf); exit (STATE_CRITICAL); } } } #endif + /* make sure the page is of an appropriate size */ + page_len = strlen (page); + if ((min_page_len > 0) && (page_len < min_page_len)) { + printf ("HTTP WARNING: page size too small%s|size=%i\n", + (display_html ? "" : ""), page_len ); + exit (STATE_WARNING); + } /* We only get here if all tests have been passed */ - asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n", + asprintf (&msg, "HTTP OK %s - %.3f second response time %s%s|time=%.3f\n", status_line, (float)elapsed_time, timestamp, (display_html ? "" : ""), elapsed_time); terminate (STATE_OK, msg); @@ -896,14 +877,17 @@ int connect_SSL (void) { SSL_METHOD *meth; - randbuff = strscpy (NULL, "qwertyuiopasdfghjkl"); + asprintf (&randbuff, "%s", "qwertyuiopasdfghjklqwertyuiopasdfghjkl"); RAND_seed (randbuff, strlen (randbuff)); + if (verbose) + printf("SSL seeding: %s\n", (RAND_status()==1 ? "OK" : "Failed") ); + /* Initialize SSL context */ SSLeay_add_ssl_algorithms (); meth = SSLv23_client_method (); SSL_load_error_strings (); if ((ctx = SSL_CTX_new (meth)) == NULL) { - printf ("ERROR: Cannot create SSL context.\n"); + printf ("CRITICAL - Cannot create SSL context.\n"); return STATE_CRITICAL; } @@ -927,7 +911,7 @@ int connect_SSL (void) ERR_print_errors_fp (stderr); } else { - printf ("ERROR: Cannot initiate SSL handshake.\n"); + printf ("CRITICAL - Cannot initiate SSL handshake.\n"); } SSL_free (ssl); } @@ -955,7 +939,7 @@ check_certificate (X509 ** certificate) /* Generate tm structure to process timestamp */ if (tm->type == V_ASN1_UTCTIME) { if (tm->length < 10) { - printf ("ERROR: Wrong time format in certificate.\n"); + printf ("CRITICAL - Wrong time format in certificate.\n"); return STATE_CRITICAL; } else { @@ -967,7 +951,7 @@ check_certificate (X509 ** certificate) } else { if (tm->length < 12) { - printf ("ERROR: Wrong time format in certificate.\n"); + printf ("CRITICAL - Wrong time format in certificate.\n"); return STATE_CRITICAL; } else { @@ -996,20 +980,20 @@ check_certificate (X509 ** certificate) stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min); if (days_left > 0 && days_left <= days_till_exp) { - printf ("Certificate expires in %d day(s) (%s).\n", days_left, timestamp); + printf ("WARNING - Certificate expires in %d day(s) (%s).\n", days_left, timestamp); return STATE_WARNING; } if (days_left < 0) { - printf ("Certificate expired on %s.\n", timestamp); + printf ("CRITICAL - Certificate expired on %s.\n", timestamp); return STATE_CRITICAL; } if (days_left == 0) { - printf ("Certificate expires today (%s).\n", timestamp); + printf ("WARNING - Certificate expires today (%s).\n", timestamp); return STATE_WARNING; } - printf ("Certificate will expire on %s.\n", timestamp); + printf ("OK - Certificate will expire on %s.\n", timestamp); return STATE_OK; } @@ -1065,7 +1049,7 @@ print_help (void) print_usage (); printf ("NOTE: One or both of -H and -I must be specified\n"); printf ("\nOptions:\n" LONGOPTIONS "\n", HTTP_EXPECT, HTTP_PORT, - DEFAULT_SOCKET_TIMEOUT, SSLOPTIONS); + DEFAULT_SOCKET_TIMEOUT, SSLOPTIONS, REGOPTIONS); #ifdef HAVE_SSL printf (SSLDESCRIPTION); #endif @@ -1076,12 +1060,7 @@ void print_usage (void) { printf ("Usage:\n" " %s %s\n" -#ifdef HAVE_GETOPT_H " %s (-h | --help) for detailed help\n" " %s (-V | --version) for version information\n", -#else - " %s -h for detailed help\n" - " %s -V for version information\n", -#endif progname, OPTIONS, progname, progname); }