X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_tcp.c;h=ad8b0429009d40037f474d71f1daeae56e6a14d8;hb=d4c0948266f261525e12c58d58e0fc68987a9818;hp=126907f99c2627660a536889d141263d4fda4e33;hpb=43f7946598f062f80c2c92eb3757cb9a2c8ce1ec;p=nagiosplug.git diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 126907f..ad8b042 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -14,12 +14,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + $Id$ + *****************************************************************************/ /* progname "check_tcp" changes depending on symlink called */ char *progname; const char *revision = "$Revision$"; -const char *copyright = "1999-2003"; +const char *copyright = "1999-2004"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" @@ -45,207 +47,217 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #endif #ifdef HAVE_SSL -SSL_CTX *ctx; -SSL *ssl; -int connect_SSL (void); +static int check_cert = FALSE; +static int days_till_exp; +static char *randbuff = ""; +static SSL_CTX *ctx; +static SSL *ssl; +static X509 *server_cert; +static int connect_SSL (void); +static int check_certificate (X509 **); +# define my_recv(buf, len) ((flags & FLAG_SSL) ? SSL_read(ssl, buf, len) : read(sd, buf, len)) +#else +# define my_recv(buf, len) read(sd, buf, len) #endif -enum { - TCP_PROTOCOL = 1, - UDP_PROTOCOL = 2, - MAXBUF = 1024 -}; -int process_arguments (int, char **); -int my_recv (void); +/* int my_recv(char *, size_t); */ +static int process_arguments (int, char **); void print_help (void); void print_usage (void); -char *SERVICE = NULL; -char *SEND = NULL; -char *EXPECT = NULL; -char *QUIT = NULL; -int PROTOCOL = 0; -int PORT = 0; - -int server_port = 0; -char *server_address = NULL; -char *server_send = NULL; -char *server_quit = NULL; -char **server_expect = NULL; -size_t server_expect_count = 0; -int maxbytes = 0; -char **warn_codes = NULL; -size_t warn_codes_count = 0; -char **crit_codes = NULL; -size_t crit_codes_count = 0; -unsigned int delay = 0; -double warning_time = 0; -int check_warning_time = FALSE; -double critical_time = 0; -int check_critical_time = FALSE; -int hide_output = FALSE; -double elapsed_time = 0; -long microsec; -int verbose = FALSE; -int use_ssl = FALSE; -int sd = 0; -char *buffer; - - - - - - +#define EXPECT server_expect[0] +static char *SERVICE = "TCP"; +static char *SEND = NULL; +static char *QUIT = NULL; +static int PROTOCOL = IPPROTO_TCP; /* most common is default */ +static int PORT = 0; + +static char timestamp[17] = ""; +static int server_port = 0; +static char *server_address = NULL; +static char *server_send = NULL; +static char *server_quit = NULL; +static char **server_expect; +static size_t server_expect_count = 0; +static size_t maxbytes = 0; +static char **warn_codes = NULL; +static size_t warn_codes_count = 0; +static char **crit_codes = NULL; +static size_t crit_codes_count = 0; +static unsigned int delay = 0; +static double warning_time = 0; +static double critical_time = 0; +static double elapsed_time = 0; +static long microsec; +static int sd = 0; +#define MAXBUF 1024 +static char buffer[MAXBUF]; +static int expect_mismatch_state = STATE_WARNING; + +#define FLAG_SSL 0x01 +#define FLAG_VERBOSE 0x02 +#define FLAG_EXACT_MATCH 0x04 +#define FLAG_TIME_WARN 0x08 +#define FLAG_TIME_CRIT 0x10 +#define FLAG_HIDE_OUTPUT 0x20 +static size_t flags = FLAG_EXACT_MATCH; + int main (int argc, char **argv) { - int result; + int result = STATE_UNKNOWN; int i; - char *status; + char *status = NULL; struct timeval tv; + size_t len, match = -1; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); - if (strstr (argv[0], "check_udp")) { - progname = strdup ("check_udp"); - SERVICE = strdup ("UDP"); - SEND = NULL; - EXPECT = NULL; - QUIT = NULL; - PROTOCOL = UDP_PROTOCOL; - PORT = 0; + /* determine program- and service-name quickly */ + progname = strrchr(argv[0], '/'); + if(progname != NULL) progname++; + else progname = argv[0]; + + len = strlen(progname); + if(len > 6 && !memcmp(progname, "check_", 6)) { + SERVICE = progname + 6; + for(i = 0; i < len - 6; i++) + SERVICE[i] = toupper(SERVICE[i]); } - else if (strstr (argv[0], "check_tcp")) { - progname = strdup ("check_tcp"); - SERVICE = strdup ("TCP"); - SEND = NULL; - EXPECT = NULL; - QUIT = NULL; - PROTOCOL = TCP_PROTOCOL; - PORT = 0; + + /* set up a resonable buffer at first (will be realloc()'ed if + * user specifies other options) */ + server_expect = calloc(sizeof(char *), 2); + + /* determine defaults for this service's protocol */ + if (!strncmp(SERVICE, "UDP", 3)) { + PROTOCOL = IPPROTO_UDP; } - else if (strstr (argv[0], "check_ftp")) { - progname = strdup ("check_ftp"); - SERVICE = strdup ("FTP"); - SEND = NULL; - EXPECT = strdup ("220"); - QUIT = strdup ("QUIT\r\n"); - PROTOCOL = TCP_PROTOCOL; + else if (!strncmp(SERVICE, "FTP", 3)) { + EXPECT = "220"; + QUIT = "QUIT\r\n"; PORT = 21; } - else if (strstr (argv[0], "check_smtp")) { - progname = strdup ("check_smtp"); - SERVICE = strdup ("SMTP"); - SEND = NULL; - EXPECT = strdup ("220"); - QUIT = strdup ("QUIT\r\n"); - PROTOCOL = TCP_PROTOCOL; - PORT = 25; - } - else if (strstr (argv[0], "check_pop")) { - progname = strdup ("check_pop"); - SERVICE = strdup ("POP"); - SEND = NULL; - EXPECT = strdup ("+OK"); - QUIT = strdup ("QUIT\r\n"); - PROTOCOL = TCP_PROTOCOL; + else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) { + EXPECT = "+OK"; + QUIT = "QUIT\r\n"; PORT = 110; } - else if (strstr (argv[0], "check_imap")) { - progname = strdup ("check_imap"); - SERVICE = strdup ("IMAP"); - SEND = NULL; - EXPECT = strdup ("* OK"); - QUIT = strdup ("a1 LOGOUT\r\n"); - PROTOCOL = TCP_PROTOCOL; + else if (!strncmp(SERVICE, "SMTP", 4)) { + EXPECT = "220"; + QUIT = "QUIT\r\n"; + PORT = 25; + } + else if (!strncmp(SERVICE, "IMAP", 4)) { + EXPECT = "* OK"; + QUIT = "a1 LOGOUT\r\n"; PORT = 143; } #ifdef HAVE_SSL - else if (strstr(argv[0],"check_simap")) { - progname = strdup ("check_simap"); - SERVICE = strdup ("SIMAP"); - SEND=NULL; - EXPECT = strdup ("* OK"); - QUIT = strdup ("a1 LOGOUT\r\n"); - PROTOCOL=TCP_PROTOCOL; - use_ssl=TRUE; - PORT=993; + else if (!strncmp(SERVICE, "SIMAP", 5)) { + EXPECT = "* OK"; + QUIT = "a1 LOGOUT\r\n"; + flags |= FLAG_SSL; + PORT = 993; + } + else if (!strncmp(SERVICE, "SPOP", 4)) { + EXPECT = "+OK"; + QUIT = "QUIT\r\n"; + flags |= FLAG_SSL; + PORT = 995; + } + else if (!strncmp(SERVICE, "SSMTP", 5)) { + EXPECT = "220"; + QUIT = "QUIT\r\n"; + flags |= FLAG_SSL; + PORT = 465; } - else if (strstr(argv[0],"check_spop")) { - progname = strdup ("check_spop"); - SERVICE = strdup ("SPOP"); - SEND=NULL; - EXPECT = strdup ("+OK"); - QUIT = strdup ("QUIT\r\n"); - PROTOCOL=TCP_PROTOCOL; - use_ssl=TRUE; - PORT=995; + else if (!strncmp(SERVICE, "JABBER", 6)) { + SEND = "\n"; + EXPECT = " 0) { + if(flags & FLAG_VERBOSE) { + printf("server_expect_count: %d\n", server_expect_count); + for(i = 0; i < server_expect_count; i++) + printf("\t%d: %s\n", i, server_expect[i]); + } + + /* if(len) later on, we know we have a non-NULL response */ + len = 0; + if (server_expect_count) { - buffer = malloc (MAXBUF); - memset (buffer, '\0', MAXBUF); /* watch for the expect string */ - while ((i = my_recv ()) > 0) { - buffer[i] = '\0'; - asprintf (&status, "%s%s", status, buffer); - if (buffer[i-2] == '\r' && buffer[i-1] == '\n') + while ((i = my_recv(buffer, sizeof(buffer))) > 0) { + status = realloc(status, len + i + 1); + memcpy(&status[len], buffer, i); + len += i; + + /* stop reading if user-forced or data-starved */ + if(i < sizeof(buffer) || (maxbytes && len >= maxbytes)) break; - if (maxbytes>0 && strlen(status) >= (unsigned)maxbytes) + + if (maxbytes && len >= maxbytes) break; } - /* return a CRITICAL status if we couldn't read any data */ - if (strlen(status) == 0) + /* no data when expected, so return critical */ + if (len == 0) die (STATE_CRITICAL, _("No data received from host\n")); - strip (status); - - if (status && verbose) - printf ("%s\n", status); - - if (server_expect_count > 0) { - for (i = 0;; i++) { - if (verbose) - printf ("%d %d\n", i, (int)server_expect_count); - if (i >= (int)server_expect_count) - die (STATE_WARNING, _("Invalid response from host\n")); - if (strstr (status, server_expect[i])) - break; + /* force null-termination and strip whitespace from end of output */ + status[len--] = '\0'; + /* print raw output if we're debugging */ + if(flags & FLAG_VERBOSE) + printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n", + len + 1, status); + while(isspace(status[len])) status[len--] = '\0'; + + for (i = 0; i < server_expect_count; i++) { + match = -2; /* tag it so we know if we tried and failed */ + if (flags & FLAG_VERBOSE) + printf ("looking for [%s] %s [%s]\n", server_expect[i], + (flags & FLAG_EXACT_MATCH) ? "in beginning of" : "anywhere in", + status); + + /* match it. math first in short-circuit */ + if ((flags & FLAG_EXACT_MATCH && !strncmp(status, server_expect[i], strlen(server_expect[i]))) || + (!(flags & FLAG_EXACT_MATCH) && strstr(status, server_expect[i]))) + { + if(flags & FLAG_VERBOSE) puts("found it"); + match = i; + break; } } } if (server_quit != NULL) { #ifdef HAVE_SSL - if (use_ssl) { + if (flags & FLAG_SSL) { SSL_write (ssl, server_quit, (int)strlen(server_quit)); SSL_shutdown (ssl); SSL_free (ssl); SSL_CTX_free (ctx); } - else { + else #endif send (sd, server_quit, strlen (server_quit), 0); -#ifdef HAVE_SSL - } -#endif } /* close the connection */ @@ -315,38 +343,53 @@ main (int argc, char **argv) microsec = deltime (tv); elapsed_time = (double)microsec / 1.0e6; - if (check_critical_time == TRUE && elapsed_time > critical_time) + if (flags & FLAG_TIME_CRIT && elapsed_time > critical_time) result = STATE_CRITICAL; - else if (check_warning_time == TRUE && elapsed_time > warning_time) + else if (flags & FLAG_TIME_WARN && elapsed_time > warning_time) + result = STATE_WARNING; + + /* did we get the response we hoped? */ + if(match == -2 && result != STATE_CRITICAL) result = STATE_WARNING; /* reset the alarm */ alarm (0); - printf - (_("%s %s%s - %.3f second response time on port %d"), - SERVICE, - state_text (result), - (was_refused) ? " (refused)" : "", - elapsed_time, server_port); + /* this is a bit stupid, because we don't want to print the + * response time (which can look ok to the user) if we didn't get + * the response we were looking for. if-else */ + printf(_("%s %s - "), SERVICE, state_text(result)); - if (hide_output == FALSE && status && strlen(status) > 0) - printf (" [%s]", status); + if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT)) + printf("Unexpected response from host: %s", status); + else + printf("%.3f second response time on port %d", + elapsed_time, server_port); - printf (" |%s\n", fperfdata ("time", elapsed_time, "s", - TRUE, warning_time, - TRUE, critical_time, - TRUE, 0, - TRUE, socket_timeout)); + if (match != -2 && !(flags & FLAG_HIDE_OUTPUT) && len) + printf (" [%s]", status); + /* perf-data doesn't apply when server doesn't talk properly, + * so print all zeroes on warn and crit */ + if(match == -2) + printf ("|time=%fs;0.0;0.0;0.0;0.0", elapsed_time); + else + printf("|%s", + fperfdata ("time", elapsed_time, "s", + TRUE, warning_time, + TRUE, critical_time, + TRUE, 0, + TRUE, socket_timeout) + ); + + putchar('\n'); return result; } - /* process command-line arguments */ -int +static int process_arguments (int argc, char **argv) { int c; @@ -368,16 +411,21 @@ process_arguments (int argc, char **argv) {"jail", required_argument, 0, 'j'}, {"delay", required_argument, 0, 'd'}, {"refuse", required_argument, 0, 'r'}, + {"mismatch", required_argument, 0, 'M'}, {"use-ipv4", no_argument, 0, '4'}, {"use-ipv6", no_argument, 0, '6'}, {"verbose", no_argument, 0, 'v'}, {"version", no_argument, 0, 'V'}, {"help", no_argument, 0, 'h'}, +#ifdef HAVE_SSL + {"ssl", no_argument, 0, 'S'}, + {"certificate", required_argument, 0, 'D'}, +#endif {0, 0, 0, 0} }; if (argc < 2) - usage ("No arguments found\n"); + usage4 (_("No arguments found")); /* backwards compatibility */ for (c = 1; c < argc; c++) { @@ -397,7 +445,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:j", + c = getopt_long (argc, argv, "+hVv46H:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option); if (c == -1 || c == EOF || c == 1) @@ -405,17 +453,15 @@ process_arguments (int argc, char **argv) switch (c) { case '?': /* print short usage statement if args not parsable */ - printf (_("%s: Unknown argument: %s\n\n"), progname, optarg); - print_usage (); - exit (STATE_UNKNOWN); + usage2 (_("Unknown argument"), optarg); case 'h': /* help */ print_help (); exit (STATE_OK); case 'V': /* version */ - print_revision (progname, "$Revision$"); + print_revision (progname, revision); exit (STATE_OK); case 'v': /* verbose mode */ - verbose = TRUE; + flags |= FLAG_VERBOSE; break; case '4': address_family = AF_INET; @@ -424,30 +470,30 @@ process_arguments (int argc, char **argv) #ifdef USE_IPV6 address_family = AF_INET6; #else - usage (_("IPv6 support not available\n")); + usage4 (_("IPv6 support not available")); #endif break; case 'H': /* hostname */ if (is_host (optarg) == FALSE) - usage2 (_("invalid host name or address"), optarg); + usage2 (_("Invalid hostname/address"), optarg); server_address = optarg; break; case 'c': /* critical */ if (!is_intnonneg (optarg)) - usage (_("Critical threshold must be a nonnegative integer\n")); + usage4 (_("Critical threshold must be a positive integer")); else critical_time = strtod (optarg, NULL); - check_critical_time = TRUE; + flags |= FLAG_TIME_CRIT; break; case 'j': /* hide output */ - hide_output = TRUE; + flags |= FLAG_HIDE_OUTPUT; break; case 'w': /* warning */ if (!is_intnonneg (optarg)) - usage (_("Warning threshold must be a nonnegative integer\n")); + usage4 (_("Warning threshold must be a positive integer")); else warning_time = strtod (optarg, NULL); - check_warning_time = TRUE; + flags |= FLAG_TIME_WARN; break; case 'C': crit_codes = realloc (crit_codes, ++crit_codes_count); @@ -459,13 +505,13 @@ process_arguments (int argc, char **argv) break; case 't': /* timeout */ if (!is_intpos (optarg)) - usage (_("Timeout interval must be a positive integer\n")); + usage4 (_("Timeout interval must be a positive integer")); else socket_timeout = atoi (optarg); break; case 'p': /* port */ if (!is_intpos (optarg)) - usage (_("Server port must be a positive integer\n")); + usage4 (_("Port must be a positive integer")); else server_port = atoi (optarg); break; @@ -474,6 +520,7 @@ process_arguments (int argc, char **argv) break; case 'e': /* expect string (may be repeated) */ EXPECT = NULL; + flags &= ~FLAG_EXACT_MATCH; if (server_expect_count == 0) server_expect = malloc (sizeof (char *) * (++server_expect_count)); else @@ -482,9 +529,9 @@ process_arguments (int argc, char **argv) break; case 'm': if (!is_intpos (optarg)) - usage (_("Maxbytes must be a positive integer\n")); + usage4 (_("Maxbytes must be a positive integer")); else - maxbytes = atoi (optarg); + maxbytes = strtol (optarg, NULL, 0); case 'q': asprintf(&server_quit, "%s\r\n", optarg); break; @@ -496,33 +543,54 @@ process_arguments (int argc, char **argv) else if (!strncmp(optarg,"crit",4)) econn_refuse_state = STATE_CRITICAL; else - usage (_("Refuse mut be one of ok, warn, crit\n")); + usage4 (_("Refuse must be one of ok, warn, crit")); + break; + case 'M': + if (!strncmp(optarg,"ok",2)) + expect_mismatch_state = STATE_OK; + else if (!strncmp(optarg,"warn",4)) + expect_mismatch_state = STATE_WARNING; + else if (!strncmp(optarg,"crit",4)) + expect_mismatch_state = STATE_CRITICAL; + else + usage4 (_("Mismatch must be one of ok, warn, crit")); break; case 'd': if (is_intpos (optarg)) delay = atoi (optarg); else - usage (_("Delay must be a positive integer\n")); + usage4 (_("Delay must be a positive integer")); break; + case 'D': /* Check SSL cert validity - days 'til certificate expiration */ +#ifdef HAVE_SSL + if (!is_intnonneg (optarg)) + usage2 (_("Invalid certificate expiration period"), optarg); + days_till_exp = atoi (optarg); + check_cert = TRUE; + flags |= FLAG_SSL; + break; +#endif + /* fallthrough if we don't have ssl */ case 'S': -#ifndef HAVE_SSL - die (STATE_UNKNOWN, - _("SSL support not available. Install OpenSSL and recompile.")); +#ifdef HAVE_SSL + flags |= FLAG_SSL; +#else + die (STATE_UNKNOWN, _("Invalid option - SSL is not available")); #endif - use_ssl = TRUE; break; } } if (server_address == NULL) - usage (_("You must provide a server address\n")); + usage4 (_("You must provide a server address")); - return OK; + return TRUE; } - + +/* SSL-specific functions */ #ifdef HAVE_SSL -int +static int connect_SSL (void) { SSL_METHOD *meth; @@ -534,7 +602,7 @@ connect_SSL (void) OpenSSL_add_all_algorithms(); if ((ctx = SSL_CTX_new (meth)) == NULL) { - printf (_("ERROR: Cannot create SSL context.\n")); + printf (_("CRITICAL - Cannot create SSL context.\n")); return STATE_CRITICAL; } @@ -556,11 +624,14 @@ connect_SSL (void) SSL_set_fd (ssl, sd); if (SSL_connect(ssl) == 1) return OK; - ERR_print_errors_fp (stderr); + /* ERR_print_errors_fp (stderr); */ + printf (_("CRITICAL - Cannot make SSL connection ")); + ERR_print_errors_fp (stdout); + /* printf("\n"); */ } else { - printf (_("ERROR: Cannot initiate SSL handshake.\n")); + printf (_("CRITICAL - Cannot initiate SSL handshake.\n")); } SSL_free (ssl); } @@ -570,41 +641,90 @@ connect_SSL (void) return STATE_CRITICAL; } -#endif - - -int -my_recv (void) +static int +check_certificate (X509 ** certificate) { - int i; - -#ifdef HAVE_SSL - if (use_ssl) { - i = SSL_read (ssl, buffer, MAXBUF - 1); - } - else { -#endif - i = read (sd, buffer, MAXBUF - 1); -#ifdef HAVE_SSL - } -#endif - - return i; -} + ASN1_STRING *tm; + int offset; + struct tm stamp; + int days_left; + /* Retrieve timestamp of certificate */ + tm = X509_get_notAfter (*certificate); + /* Generate tm structure to process timestamp */ + if (tm->type == V_ASN1_UTCTIME) { + if (tm->length < 10) { + printf (_("CRITICAL - Wrong time format in certificate.\n")); + return STATE_CRITICAL; + } + else { + stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0'); + if (stamp.tm_year < 50) + stamp.tm_year += 100; + offset = 0; + } + } + else { + if (tm->length < 12) { + printf (_("CRITICAL - Wrong time format in certificate.\n")); + return STATE_CRITICAL; + } + else { + stamp.tm_year = + (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 + + (tm->data[2] - '0') * 10 + (tm->data[3] - '0'); + stamp.tm_year -= 1900; + offset = 2; + } + } + stamp.tm_mon = + (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1; + stamp.tm_mday = + (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0'); + stamp.tm_hour = + (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0'); + stamp.tm_min = + (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0'); + stamp.tm_sec = 0; + stamp.tm_isdst = -1; + + days_left = (mktime (&stamp) - time (NULL)) / 86400; + snprintf + (timestamp, 16, "%02d/%02d/%04d %02d:%02d", + stamp.tm_mon + 1, + 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); + return STATE_WARNING; + } + if (days_left < 0) { + printf (_("Certificate expired on %s.\n"), timestamp); + return STATE_CRITICAL; + } + + if (days_left == 0) { + printf (_("Certificate expires today (%s).\n"), timestamp); + return STATE_WARNING; + } + + printf (_("Certificate will expire on %s.\n"), timestamp); + + return STATE_OK; +} +#endif /* HAVE_SSL */ - void print_help (void) { print_revision (progname, revision); - printf (_("Copyright (c) 1999 Ethan Galstad \n")); - printf (_(COPYRIGHT), copyright, email); + printf ("Copyright (c) 1999 Ethan Galstad \n"); + printf (COPYRIGHT, copyright, email); printf (_("This plugin tests %s connections with the specified host.\n\n"), SERVICE); @@ -628,6 +748,8 @@ print_help (void) printf (_("\ -r, --refuse=ok|warn|crit\n\ Accept tcp refusals with states ok, warn, crit (default: crit)\n\ + -M, --mismatch=ok|warn|crit\n\ + Accept expected string mismatches with states ok, warn, crit (default: warn)\n\ -j, --jail\n\ Hide output from TCP socket\n\ -m, --maxbytes=INTEGER\n\ @@ -635,6 +757,14 @@ print_help (void) -d, --delay=INTEGER\n\ Seconds to wait between sending string and polling for response\n")); +#ifdef HAVE_SSL + printf (_("\ + -D, --certificate=INTEGER\n\ + Minimum number of days a certificate has to be valid.\n\ + -S, --ssl\n\ + Use SSL for the connection.\n")); +#endif + printf (_(UT_WARN_CRIT)); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); @@ -645,16 +775,14 @@ print_help (void) } - - void print_usage (void) { - printf (_("\ + printf ("\ Usage: %s -H host -p port [-w ] [-c ]\n\ - [-s ] [-e ] [-q ]\n\ - [-m ] [-d ] [-t ]\n\ - [-r ] [-v] [-4|-6] [-j]\n"), progname); - printf (" %s (-h|--help)\n", progname); - printf (" %s (-V|--version)\n", progname); + [-s ] [-e ] [-q ]\n\ + [-m ] [-d ] [-t ]\n\ + [-r ] [-M ] [-v] [-4|-6] [-j]\n\ + [-D ] [-S ]\n", progname); } +