Allow underscore in dnslist lookups

Fixes bug 1026
Patch from Graeme Fowler

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6d12f635a63f8e35e619b26cf4ac59bb6388fdf0..6e1bd45666d45c8466ce0b878eafa07cafc68f63 100644 (file)
--- 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 1ead3021671dbfe649158351e19c2143b15f2358..f653b6e0d27f8aef751d9afe04699de613f14a42 100644 (file)
--- 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);