[monitoring-plugins] check_smtp: Let "-D" option imply "-S"

[Holger Weiss]

 Module: monitoring-plugins
 Branch: master
 Commit: dfe66c01c0b556dfbac9c1d901d3ba9ed6a1deac
 Author: Holger Weiss <hol...@zedat.fu-berlin.de>
   Date: Tue Oct  6 23:28:24 2015 +0200
    URL: 
https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=dfe66c0

check_smtp: Let "-D" option imply "-S"

---

 plugins/check_smtp.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 753ea3e..2e9b68b 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -582,11 +582,6 @@ process_arguments (int argc, char **argv)
                                usage4 (_("Timeout interval must be a positive 
integer"));
                        }
                        break;
-               case 'S':
-               /* starttls */
-                       use_ssl = TRUE;
-                       use_ehlo = TRUE;
-                       break;
                case 'D':
                /* Check SSL cert validity */
 #ifdef USE_OPENSSL
@@ -612,6 +607,10 @@ process_arguments (int argc, char **argv)
 #else
                        usage (_("SSL support not available - install OpenSSL 
and recompile"));
 #endif
+               case 'S':
+               /* starttls */
+                       use_ssl = TRUE;
+                       use_ehlo = TRUE;
                        break;
                case '4':
                        address_family = AF_INET;