From bd1d25d83ef40ae48fa1cdcf276e8ba8f39a2f19 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Tue, 19 Feb 2019 16:55:44 -0500 Subject: [PATCH] Set up correct AuthservID defaults MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without this fix, a verifying dkimpy-milter that has no explicit AuthservID produces the following crashing behavior as it tries to create the authres header: Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/Milter/__init__.py", line 772, in milter.set_eom_callback(lambda ctx: ctx.getpriv().eom()) File "…/dkimpy_milter/__init__.py", line 199, in eom h = fold(str(h)) File "/usr/lib/python2.7/dist-packages/authres/core.py", line 476, in __str__ return ''.join((self.HEADER_FIELD_NAME, ': ', self.header_value())) File "/usr/lib/python2.7/dist-packages/authres/core.py", line 496, in header_value return ''.join(strs) --- dkimpy_milter/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dkimpy_milter/config.py b/dkimpy_milter/config.py index 3359246..601017a 100644 --- a/dkimpy_milter/config.py +++ b/dkimpy_milter/config.py @@ -401,7 +401,7 @@ def _readConfigFile(path, configData=None, configGlobal={}): configData[name] = conversion(value) fp.close() try: - configData['AuthservID'] = _make_authserv_id(configData['AuthservID']) + configData['AuthservID'] = _make_authserv_id(configData.get('AuthservID', 'HOSTNAME')) configData['IntHosts'] = HostsDataset(configData['InternalHosts']) except: pass