fanf2 2005/06/10 19:59:35 BST
Modified files:
exim-src/src acl.c
exim-src/src/lookups dnsdb.c
Log:
A minor code clean-up and a comment fix for the CSA patch arising
from a bug report by John Horne. The lack of initialization of the
found variable in acl_verify_csa() was not a bug but I've fixed it
because it's risky.
Bug ID 26
Revision Changes Path
1.38 +1 -0 exim/exim-src/src/acl.c
1.14 +7 -7 exim/exim-src/src/lookups/dnsdb.c
Index: acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -u -r1.37 -r1.38
--- acl.c 31 May 2005 17:07:39 -0000 1.37
+++ acl.c 10 Jun 2005 18:59:34 -0000 1.38
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.37 2005/05/31 17:07:39 fanf2 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.38 2005/06/10 18:59:34 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -1143,6 +1143,7 @@
/* Now we are ready to do the actual DNS lookup(s). */
+found = domain;
switch (dns_special_lookup(&dnsa, domain, T_CSA, &found))
{
/* If something bad happened (most commonly DNS_AGAIN), defer. */
Index: dnsdb.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/lookups/dnsdb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- dnsdb.c 10 Jun 2005 13:38:06 -0000 1.13
+++ dnsdb.c 10 Jun 2005 18:59:35 -0000 1.14
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/lookups/dnsdb.c,v 1.13 2005/06/10 13:38:06 tom Exp $ */
+/* $Cambridge: exim/exim-src/src/lookups/dnsdb.c,v 1.14 2005/06/10 18:59:35 fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -249,13 +249,13 @@
DEBUG(D_lookup) debug_printf("dnsdb key: %s\n", domain);
- /* Do the lookup and sort out the result. There are two special types that
- are handled specially: T_ZNS and T_MXH. The former is handled in a special
- lookup function so that the facility could be used from other parts of the
- Exim code. The latter affects only what happens later on in this function,
- but for tidiness it is handled in a similar way. If the lookup fails,
- continue with the next domain. In the case of DEFER, adjust the final
- "nothing found" result, but carry on to the next domain. */
+ /* Do the lookup and sort out the result. There are three special types that
+ are handled specially: T_CSA, T_ZNS and T_MXH. The former two are handled in
+ a special lookup function so that the facility could be used from other
+ parts of the Exim code. The latter affects only what happens later on in
+ this function, but for tidiness it is handled in a similar way. If the
+ lookup fails, continue with the next domain. In the case of DEFER, adjust
+ the final "nothing found" result, but carry on to the next domain. */
found = domain;
rc = dns_special_lookup(&dnsa, domain, type, &found);
