diff options
| author | Kevin Bowling <kbowling@FreeBSD.org> | 2023-05-03 21:19:31 +0000 |
|---|---|---|
| committer | Kevin Bowling <kbowling@FreeBSD.org> | 2023-05-03 21:19:31 +0000 |
| commit | e4f35938f00c6dc25a2007807b7ff25fde0fedda (patch) | |
| tree | 6f4a3c3b403daecda3e7b9b160ba21f4e7d0b462 /news | |
| parent | 88321122cef429fde0ea02c83fc25c05927b0f70 (diff) | |
| download | ports-e4f35938f00c6dc25a2007807b7ff25fde0fedda.tar.gz ports-e4f35938f00c6dc25a2007807b7ff25fde0fedda.zip | |
news/inn: Ignore more domain/FQDN errors for poudriere
The builder environment doesn't have a vaild FQDN so this is failing a
downstream port build.
Reported by: thierry
Diffstat (limited to 'news')
| -rw-r--r-- | news/inn/files/patch-lib_innconf.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/news/inn/files/patch-lib_innconf.c b/news/inn/files/patch-lib_innconf.c index 18a40d901864..360937494fe6 100644 --- a/news/inn/files/patch-lib_innconf.c +++ b/news/inn/files/patch-lib_innconf.c @@ -1,11 +1,23 @@ ---- lib/innconf.c.orig 2015-09-12 15:25:22.000000000 +0200 -+++ lib/innconf.c 2015-09-21 21:15:18.446435000 +0200 -@@ -473,7 +473,7 @@ innconf_validate(struct config_group *gr - - if (GetFQDN(innconf->domain) == NULL) { +--- lib/innconf.c.orig 2023-04-16 19:50:54 UTC ++++ lib/innconf.c +@@ -447,17 +447,17 @@ innconf_validate(struct config_group *group) + fqdn = inn_getfqdn(innconf->domain); + if (fqdn == NULL) { warn("hostname does not resolve or domain not set in inn.conf"); - okay = false; +/* okay = false; */ } - if (innconf->mta == NULL) { - warn("must set mta in inn.conf"); + if (innconf->domain != NULL && !IsValidDomain(innconf->domain)) { + warn("domain in inn.conf contains invalid characters not suitable for " + "Message-IDs"); +- okay = false; ++/* okay = false; */ + } + if (innconf->domain == NULL && !IsValidDomain(fqdn)) { + warn("the FQDN of the server contains invalid characters not suitable " + "for Message-IDs"); +- okay = false; ++/* okay = false; */ + } + free(fqdn); + |