diff options
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | plugins/check_smtp.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -18,6 +18,7 @@ This file documents the major additions and syntax changes between releases. | |||
18 | Let check_real terminate lines with CRLF when talking to the server, as | 18 | Let check_real terminate lines with CRLF when talking to the server, as |
19 | mandated by 2326 | 19 | mandated by 2326 |
20 | Fix check_procs on HP-UX | 20 | Fix check_procs on HP-UX |
21 | check_smtp's -e/--expect option can now be combined with -S/--starttls | ||
21 | 22 | ||
22 | WARNINGS | 23 | WARNINGS |
23 | The format of the performance data emitted by check_mrtgtraf has been | 24 | The format of the performance data emitted by check_mrtgtraf has been |
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index 2e9b68b..1996c6d 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
@@ -231,7 +231,7 @@ main (int argc, char **argv) | |||
231 | send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); | 231 | send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0); |
232 | 232 | ||
233 | recvlines(buffer, MAX_INPUT_BUFFER); /* wait for it */ | 233 | recvlines(buffer, MAX_INPUT_BUFFER); /* wait for it */ |
234 | if (!strstr (buffer, server_expect)) { | 234 | if (!strstr (buffer, SMTP_EXPECT)) { |
235 | printf (_("Server does not support STARTTLS\n")); | 235 | printf (_("Server does not support STARTTLS\n")); |
236 | smtp_quit(); | 236 | smtp_quit(); |
237 | return STATE_UNKNOWN; | 237 | return STATE_UNKNOWN; |