Mercurial > dnsbl

comparison src/dnsbl.cpp @ 338:f375a67ee516

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
set st in all paths; missing +1 to avoid lookup starting with @
author Carl Byington <carl@five-ten-sg.com>
date Tue, 20 Dec 2016 17:21:26 -0800
parents d68fda9be1c1
children be776a246f97
comparison
equal deleted inserted replaced
337:d68fda9be1c1 338:f375a67ee516
1294 else if ((fromvalue == token_white) && !self) { 1294 else if ((fromvalue == token_white) && !self) {
1295 // whitelisting based on envelope from value, but ignore it if 1295 // whitelisting based on envelope from value, but ignore it if
1296 // we have a dkim requirement for that domain. 1296 // we have a dkim requirement for that domain.
1297 const char *domain = strchr(priv.mailaddr, '@'); 1297 const char *domain = strchr(priv.mailaddr, '@');
1298 if (domain) { 1298 if (domain) {
1299 DKIMP dk = con.find_dkim_from(domain); 1299 DKIMP dk = con.find_dkim_from(domain+1);
1300 if (dk && (dk->action == token_require_signed)) { 1300 if (dk && (dk->action == token_require_signed)) {
1301 my_syslog(&priv, "dkim require_signed overrides envelope from whitelist"); 1301 my_syslog(&priv, "dkim require_signed overrides envelope from whitelist");
1302 st = oksofar;
1302 } 1303 }
1303 else st = white; 1304 else st = white;
1304 } 1305 }
1305 else st = white; // might be <>, envelope from has no @ 1306 else st = white; // might be <>, envelope from has no @
1306 } 1307 }