[monitoring-plugins] check_smtp: QUIT SMTP connection when "-D" is used

[Sven Nierlein]

    Module: monitoring-plugins
    Branch: maint
    Commit: 7e285e27b43df22e963c6e0b288cffba6f0c74a2
    Author: Holger Weiss <holger at zedat.fu-berlin.de>
 Committer: Sven Nierlein <sven at nierlein.de>
      Date: Tue Oct  6 23:21:17 2015 +0200
       URL: https://www.monitoring-plugins.org/repositories/monitoring-plugins/commit/?id=7e285e2

check_smtp: QUIT SMTP connection when "-D" is used

Don't forget to issue an SMTP QUIT command when the -D/--certificate
option is specified.  This avoids undesired MTA log messages.

(cherry picked from commit b317aaf32a8a054f0274aef9137353bffef7a80c)

---

 plugins/check_smtp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 2430453..df6f137 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -276,6 +276,7 @@ main (int argc, char **argv)
 #  ifdef USE_OPENSSL
 		  if ( check_cert ) {
                     result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+		    smtp_quit();
 		    my_close();
 		    return result;
 		  }
@@ -607,6 +608,7 @@ process_arguments (int argc, char **argv)
                             days_till_exp_warn = atoi (optarg);
                         }
 			check_cert = TRUE;
+			ignore_send_quit_failure = TRUE;
 #else
 			usage (_("SSL support not available - install OpenSSL and recompile"));
 #endif