aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--plugins/check_smtp.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index a489ee21..f36326a9 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ This file documents the major additions and syntax changes between releases.
Let check_real terminate lines with CRLF when talking to the server, as
mandated by 2326
Fix check_procs on HP-UX
+ check_smtp's -e/--expect option can now be combined with -S/--starttls
WARNINGS
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 2e9b68b1..1996c6d3 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -231,7 +231,7 @@ main (int argc, char **argv)
send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
recvlines(buffer, MAX_INPUT_BUFFER); /* wait for it */
- if (!strstr (buffer, server_expect)) {
+ if (!strstr (buffer, SMTP_EXPECT)) {
printf (_("Server does not support STARTTLS\n"));
smtp_quit();
return STATE_UNKNOWN;