summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2015-10-06 23:28:24 +0200
committerHolger Weiss <holger@zedat.fu-berlin.de>2015-10-06 23:28:24 +0200
commitdfe66c01c0b556dfbac9c1d901d3ba9ed6a1deac (patch)
tree068bf19f2870eef3cfd3b8491be07ce72b53ece5
parentb317aaf32a8a054f0274aef9137353bffef7a80c (diff)
downloadmonitoring-plugins-dfe66c01c0b556dfbac9c1d901d3ba9ed6a1deac.tar.gz
check_smtp: Let "-D" option imply "-S"
-rw-r--r--plugins/check_smtp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 753ea3e7..2e9b68b1 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -582,11 +582,6 @@ process_arguments (int argc, char **argv)
582 usage4 (_("Timeout interval must be a positive integer")); 582 usage4 (_("Timeout interval must be a positive integer"));
583 } 583 }
584 break; 584 break;
585 case 'S':
586 /* starttls */
587 use_ssl = TRUE;
588 use_ehlo = TRUE;
589 break;
590 case 'D': 585 case 'D':
591 /* Check SSL cert validity */ 586 /* Check SSL cert validity */
592#ifdef USE_OPENSSL 587#ifdef USE_OPENSSL
@@ -612,6 +607,10 @@ process_arguments (int argc, char **argv)
612#else 607#else
613 usage (_("SSL support not available - install OpenSSL and recompile")); 608 usage (_("SSL support not available - install OpenSSL and recompile"));
614#endif 609#endif
610 case 'S':
611 /* starttls */
612 use_ssl = TRUE;
613 use_ehlo = TRUE;
615 break; 614 break;
616 case '4': 615 case '4':
617 address_family = AF_INET; 616 address_family = AF_INET;