ph10 2006/06/27 15:04:29 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src acl.c
exim-test/log 0027
exim-test/rejectlog 0027
Log:
Update error message for unknown ACL verb.
Revision Changes Path
1.358 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.60 +2 -1 exim/exim-src/src/acl.c
1.2 +1 -1 exim/exim-test/log/0027
1.2 +1 -1 exim/exim-test/rejectlog/0027
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- ChangeLog 27 Jun 2006 13:39:01 -0000 1.357
+++ ChangeLog 27 Jun 2006 14:04:29 -0000 1.358
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.357 2006/06/27 13:39:01 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.358 2006/06/27 14:04:29 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -38,6 +38,8 @@
PH/01 Added #define LDAP_DEPRECATED 1 to ldap.c because some of the "old"
functions that Exim currently uses aren't defined in ldap.h for OpenLDAP
without this. I don't know how relevant this is to other LDAP libraries.
+
+PH/02 Add the verb name to the "unknown ACL verb" error.
Exim version 4.62
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- acl.c 7 Jun 2006 15:06:26 -0000 1.59
+++ acl.c 27 Jun 2006 14:04:29 -0000 1.60
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.59 2006/06/07 15:06:26 fanf2 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.60 2006/06/27 14:04:29 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -720,7 +720,8 @@
{
if (this == NULL)
{
- *error = string_sprintf("unknown ACL verb in \"%s\"", saveline);
+ *error = string_sprintf("unknown ACL verb \"%s\" in \"%s\"", name,
+ saveline);
return NULL;
}
}
Index: 0027
===================================================================
RCS file: /home/cvs/exim/exim-test/log/0027,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0027 7 Feb 2006 10:34:46 -0000 1.1
+++ 0027 27 Jun 2006 14:04:29 -0000 1.2
@@ -5,7 +5,7 @@
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@???>: cannot check header contents in ACL for RCPT (only possible in ACL for DATA)
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = junk"@???>: expected "sender[=address]", "recipient", "helo", "header_syntax", "header_sender" or "reverse_host_lookup" at start of ACL condition "verify junk"
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny vorify = junk"@???>: unknown ACL condition/modifier in "deny vorify = junk"
-1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb in "dony verify = junk"
+1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb "dony" in "dony verify = junk"
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny !message = abcd"@???>: ACL error: negation is not allowed with "message"
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA (only possible for RCPT)
1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
Index: 0027
===================================================================
RCS file: /home/cvs/exim/exim-test/rejectlog/0027,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0027 7 Feb 2006 10:47:29 -0000 1.1
+++ 0027 27 Jun 2006 14:04:29 -0000 1.2
@@ -5,7 +5,7 @@
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@???>: cannot check header contents in ACL for RCPT (only possible in ACL for DATA)
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = junk"@???>: expected "sender[=address]", "recipient", "helo", "header_syntax", "header_sender" or "reverse_host_lookup" at start of ACL condition "verify junk"
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny vorify = junk"@???>: unknown ACL condition/modifier in "deny vorify = junk"
-1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb in "dony verify = junk"
+1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb "dony" in "dony verify = junk"
1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny !message = abcd"@???>: ACL error: negation is not allowed with "message"
1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA (only possible for RCPT)
Envelope-from: <>
