[exim-cvs] Allow underscore in dnslist lookups

Gitweb: http://git.exim.org/exim.git/commitdiff/09dcaba9252681dbacff8c19b34e983c659e44b9

Commit:     09dcaba9252681dbacff8c19b34e983c659e44b9
Parent:     caacae52d712420d97b5f776f418b1f1df4e12b6
Author:     Nigel Metheringham <nigel@???>
AuthorDate: Sun Jan 30 19:45:13 2011 +0000
Committer:  Nigel Metheringham <nigel@???>
CommitDate: Sun Jan 30 19:45:13 2011 +0000

    Allow underscore in dnslist lookups

    Fixes bug 1026
    Patch from Graeme Fowler
---
 doc/doc-txt/ChangeLog |    3 +++
 src/src/verify.c      |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6d12f63..6e1bd45 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -29,6 +29,9 @@ PP/03 Build issue: lookups-Makefile now exports LC_ALL=C
 NM/02 Fix wide character breakage in the rfc2047 coding
       Fixes bug 1064. Patch from Andrey N. Oktyabrski

+NM/03 Allow underscore in dnslist lookups
+      Fixes bug 1026. Patch from Graeme Fowler
+

Exim version 4.74
diff --git a/src/src/verify.c b/src/src/verify.c
index 1ead302..f653b6e 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -3038,7 +3038,7 @@ while ((domain = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL

   for (s = domain; *s != 0; s++)
     {
-    if (!isalnum(*s) && *s != '-' && *s != '.')
+    if (!isalnum(*s) && *s != '-' && *s != '.' && *s != '_')
       {
       log_write(0, LOG_MAIN, "dnslists domain \"%s\" contains "
         "strange characters - is this right?", domain);
@@ -3050,7 +3050,7 @@ while ((domain = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL

   if (domain_txt != domain) for (s = domain_txt; *s != 0; s++)
     {
-    if (!isalnum(*s) && *s != '-' && *s != '.')
+    if (!isalnum(*s) && *s != '-' && *s != '.' && *s != '_')
       {
       log_write(0, LOG_MAIN, "dnslists domain \"%s\" contains "
         "strange characters - is this right?", domain_txt);