Allow slashes in the dns_check_names_pattern default value.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 5d645ab0cdc3810857bcc778d480b30715b3c086..7ffb39b8be7cbccb808b7b621569a1bbdb7447e7 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.302 2006/02/14 15:56:43 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.303 2006/02/14 16:18:14 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -176,6 +176,11 @@ PH/34 Omit spaces between a header name and the colon in the error message that
       is given when verify = headers_syntax fails (if there are lots of them,
       the message gets confusing).
 
       is given when verify = headers_syntax fails (if there are lots of them,
       the message gets confusing).
 

+PH/35 Change the default for dns_check_names_pattern to allow slashes within
+      names, as there are now some PTR records that contain slashes. This check
+      is only to protect against broken name servers that fall over on strange
+      characters, so the fact that it applies to all lookups doesn't matter.
+

 
 Exim version 4.60
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index fdccff410a35c97e0d71afffed8876979ec90d33..5d3d87b7e65f2a79ccb3cc8d97d4cf34b04904b2 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.85 2006/02/14 14:55:37 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.86 2006/02/14 16:18:14 ph10 Exp $

 
 New Features in Exim
 --------------------
 
 New Features in Exim
 --------------------


@@ -55,6 +55,12 @@ PH/07 There is a new log selector called sender_verify_fail, which is set by
       of SMTP commands (e.g. RCPT) contain just "sender verify failed", so some
       detail is lost.
 
       of SMTP commands (e.g. RCPT) contain just "sender verify failed", so some
       detail is lost.
 

+PH/08 The default for dns_check_names_pattern now allows slashes within names,
+      as there are now some PTR records that contain slashes. This check is
+      only to protect against broken name servers that fall over on strange
+      characters, so the fact that it applies to all lookups doesn't matter.
+
+

 
 Version 4.60
 ------------
 
 Version 4.60
 ------------

diff --git a/src/src/globals.c b/src/src/globals.c
index 4031fa2d381ac92750f1a3eda4cac1dbea236523..5dc7ccd37d97149701f2703db49f5cf36001a72c 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.49 2006/02/14 14:55:37 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.50 2006/02/14 16:18:14 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -370,7 +370,7 @@ int     callout_cache_domain_negative_expire = 3*60*60;
 int     callout_cache_positive_expire = 24*60*60;
 int     callout_cache_negative_expire = 2*60*60;
 uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";
 int     callout_cache_positive_expire = 24*60*60;
 int     callout_cache_negative_expire = 2*60*60;
 uschar *callout_random_local_part = US"$primary_hostname-$tod_epoch-testing";

-uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9-]*[^\\W_])?)+$";
+uschar *check_dns_names_pattern= US"(?i)^(?>(?(1)\\.|())[^\\W_](?>[a-z0-9/-]*[^\\W_])?)+$";

 int     check_log_inodes       = 0;
 int     check_log_space        = 0;
 BOOL    check_rfc2047_length   = TRUE;
 int     check_log_inodes       = 0;
 int     check_log_space        = 0;
 BOOL    check_rfc2047_length   = TRUE;

diff --git a/test/dnszones-src/db.test.ex b/test/dnszones-src/db.test.ex
index 2e2865eb4c1c4f584bed8f61fd7e97405343d58e..bf0c2092c1b71d9dd7b97a904dafc3b782da27b8 100644 (file)
--- a/test/dnszones-src/db.test.ex
+++ b/test/dnszones-src/db.test.ex
@@ -1,4 +1,4 @@
-; $Cambridge: exim/test/dnszones-src/db.test.ex,v 1.1 2006/02/06 16:22:56 ph10 Exp $
+; $Cambridge: exim/test/dnszones-src/db.test.ex,v 1.2 2006/02/14 16:18:14 ph10 Exp $

 
 ; This is a testing zone file for use when testing DNS handling in Exim. This
 ; is a fake zone of no real use - hence no SOA record. The zone name is
 
 ; This is a testing zone file for use when testing DNS handling in Exim. This
 ; is a fake zone of no real use - hence no SOA record. The zone name is


@@ -21,6 +21,7 @@
 test.ex.     NS      exim.test.ex.
 
 test.ex.     TXT     "A TXT record for test.ex."
 test.ex.     NS      exim.test.ex.
 
 test.ex.     TXT     "A TXT record for test.ex."

+s/lash       TXT     "A TXT record for s/lash.test.ex."

 
 cname        CNAME   test.ex.
 
 
 cname        CNAME   test.ex.
 

diff --git a/test/scripts/2200-dnsdb/2200 b/test/scripts/2200-dnsdb/2200
index ccb326c2b51834491ee56e5a1bb069e66c8eea74..1277b9ca66211e0574a27dd2356bc4d2e57e3af3 100644 (file)
--- a/test/scripts/2200-dnsdb/2200
+++ b/test/scripts/2200-dnsdb/2200
@@ -2,6 +2,7 @@
 
 exim -be
 test.ex                    ${lookup dnsdb{test.ex}{$value}fail}
 
 exim -be
 test.ex                    ${lookup dnsdb{test.ex}{$value}fail}

+s/lash.test.ex             ${lookup dnsdb{s/lash.test.ex}{$value}fail}

 txt=test.ex                ${lookup dnsdb{txt=test.ex}{$value}fail}
 a=black-1.test.ex          ${lookup dnsdb{a=black-1.test.ex}{$value}fail}
 xxx=test.ex                ${lookup dnsdb{xxx=test.ex}{$value}fail}
 txt=test.ex                ${lookup dnsdb{txt=test.ex}{$value}fail}
 a=black-1.test.ex          ${lookup dnsdb{a=black-1.test.ex}{$value}fail}
 xxx=test.ex                ${lookup dnsdb{xxx=test.ex}{$value}fail}

diff --git a/test/stdout/2200 b/test/stdout/2200
index bce322f54ec28ec6a4f0b79cbb344f48095e0d5d..5d0b397bdcdfb4340ec86cacad40d566522c758c 100644 (file)
--- a/test/stdout/2200
+++ b/test/stdout/2200
@@ -1,4 +1,5 @@
 > test.ex                    A TXT record for test.ex.
 > test.ex                    A TXT record for test.ex.

+> s/lash.test.ex             A TXT record for s/lash.test.ex.

 > txt=test.ex                A TXT record for test.ex.
 > a=black-1.test.ex          V4NET.11.12.13
 > Failed: lookup of "xxx=test.ex" gave DEFER: unsupported DNS record type
 > txt=test.ex                A TXT record for test.ex.
 > a=black-1.test.ex          V4NET.11.12.13
 > Failed: lookup of "xxx=test.ex" gave DEFER: unsupported DNS record type