summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2007-06-19 13:32:05 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2007-06-19 13:32:05 +0000
commitaa6dc51334206deff2ec80bfcbcf543714efe6d6 (patch)
tree07d78091e2ed74516594e577a6ec3922d5314ec9
parent6c512171a8449f14cc284e13aabc0153d9977c43 (diff)
Fix text type in ACL error message.
-rw-r--r--doc/doc-txt/ChangeLog5
-rw-r--r--src/src/acl.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index cd802708e..76ab6e7a1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.513 2007/06/18 13:57:49 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.514 2007/06/19 13:32:05 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -57,6 +57,9 @@ PH/05 Unset $tls_cipher and $tls_peerdn before making a connection as a client.
PH/06 Added the client_condition to authenticators so that some can be skipped
by clients under certain conditions.
+PH/07 The error message for a badly-placed control=no_multiline_responses left
+ "_responses" off the end of the name.
+
Exim version 4.67
-----------------
diff --git a/src/src/acl.c b/src/src/acl.c
index 41058afa7..277ea8d4f 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/acl.c,v 1.75 2007/03/01 11:17:00 ph10 Exp $ */
+/* $Cambridge: exim/src/src/acl.c,v 1.76 2007/06/19 13:32:06 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -221,7 +221,7 @@ static uschar *controls[] = {
#endif
US"fakedefer",
US"fakereject",
- US"no_multiline",
+ US"no_multiline_responses",
US"no_pipelining",
US"no_delay_flush",
US"no_callout_flush"