From d6b81a591295cb50709f5cd6c21c4a9f80770a3e Mon Sep 17 00:00:00 2001 From: "M. Sean Finney" Date: Thu, 7 Apr 2005 04:33:33 +0000 Subject: in honor of joining up, my first bugfix. this should resolve 1174070. note i don't have an exchange server to test this against, but it does what the requester mentioned (slightly cleaner than the patch attached in the tracker). it does, however, still work against my own postfix server :) sean git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1158 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/check_smtp.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 3bb6cc46..f0bc7363 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -177,6 +177,13 @@ main (int argc, char **argv) result = STATE_WARNING; } } + + /* send the HELO command */ + send(sd, helocmd, strlen(helocmd), 0); + + /* allow for response to helo command to reach us */ + read (sd, buffer, MAXBUF - 1); + #ifdef HAVE_SSL if(use_ssl) { /* send the STARTTLS command */ @@ -206,16 +213,6 @@ main (int argc, char **argv) } } #endif - /* send the HELO command */ -#ifdef HAVE_SSL - if (use_ssl) - SSL_write(ssl, helocmd, strlen(helocmd)); - else -#endif - send(sd, helocmd, strlen(helocmd), 0); - - /* allow for response to helo command to reach us */ - myrecv(); /* sendmail will syslog a "NOQUEUE" error if session does not attempt * to do something useful. This can be prevented by giving a command -- cgit v1.2.3