ph10 2006/06/27 16:07:18 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src acl.c
Added files:
exim-test/confs 0534
exim-test/scripts/0000-Basic 0534
exim-test/stderr 0534
exim-test/stdout 0534
Log:
Fix Bugzilla #101: macro definition between ACLs doesn't work.
Revision Changes Path
1.360 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.61 +1 -1 exim/exim-src/src/acl.c
1.3 +30 -0 exim/exim-test/confs/0534 (new)
1.3 +4 -0 exim/exim-test/scripts/0000-Basic/0534 (new)
1.1 +13 -0 exim/exim-test/stderr/0534 (new)
1.1 +7 -0 exim/exim-test/stdout/0534 (new)
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -r1.359 -r1.360
--- ChangeLog 27 Jun 2006 14:34:26 -0000 1.359
+++ ChangeLog 27 Jun 2006 15:07:18 -0000 1.360
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.359 2006/06/27 14:34:26 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.360 2006/06/27 15:07:18 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -42,6 +42,8 @@
PH/02 Add the verb name to the "unknown ACL verb" error.
PH/03 Magnus Holmgren's patch for filter_prepend_home.
+
+PH/03 Fixed Bugzilla #101: macro definition between ACLs doesn't work.
Exim version 4.62
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- acl.c 27 Jun 2006 14:04:29 -0000 1.60
+++ acl.c 27 Jun 2006 15:07:18 -0000 1.61
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.60 2006/06/27 14:04:29 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.61 2006/06/27 15:07:18 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -710,7 +710,7 @@
can be started by a name, or by a macro definition. */
s = readconf_readname(name, sizeof(name), s);
- if (*s == ':' || isupper(name[0] && *s == '=')) return yield;
+ if (*s == ':' || (isupper(name[0]) && *s == '=')) return yield;
/* If a verb is unrecognized, it may be another condition or modifier that
continues the previous verb. */
Index: 0534
====================================================================
>>> host in hosts_connection_nolog? no (option unset)
>>> host in host_lookup? no (option unset)
>>> host in host_reject_connection? no (option unset)
>>> host in sender_unqualified_hosts? no (option unset)
>>> host in recipient_unqualified_hosts? no (option unset)
>>> host in helo_verify_hosts? no (option unset)
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "two"
>>> processing "accept"
>>> check hosts = 5.6.7.8
>>> host in "5.6.7.8"? yes (matched "5.6.7.8")
>>> accept: condition test succeeded
Index: 0534
====================================================================
**** SMTP testing session as if from host 5.6.7.8
**** but without any ident (RFC 1413) callback.
**** This is not for real!
220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
221 myhost.test.ex closing connection
