diff options
| author | Nigel Metheringham <nigel@exim.org> | 2011-01-30 19:45:13 +0000 |
|---|---|---|
| committer | Nigel Metheringham <nigel@exim.org> | 2011-01-30 19:45:13 +0000 |
| commit | 09dcaba9252681dbacff8c19b34e983c659e44b9 (patch) | |
| tree | 01c004b93f65cfa411d9f11bbcade9cbff5c9f57 | |
| parent | caacae52d712420d97b5f776f418b1f1df4e12b6 (diff) | |
Allow underscore in dnslist lookups
Fixes bug 1026
Patch from Graeme Fowler
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | 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 6d12f635a..6e1bd4566 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 1ead30216..f653b6e0d 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); |