From f1658930db64af8fecff9c8697592f676114409c Mon Sep 17 00:00:00 2001 From: Ian C Date: Fri, 5 Dec 2003 19:38:37 +0000 Subject: Changed ordering so that HTML block doesn't apply to trusted messages --- src/dbase.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/dbase.c') diff --git a/src/dbase.c b/src/dbase.c index 14263dd..ce568af 100644 --- a/src/dbase.c +++ b/src/dbase.c @@ -226,18 +226,16 @@ int DBBlockMessage(const POP3Message *msg) const Domain *dom; int f; - if (ConfigInt(CONFIG_BLOCKHTML) && - strncmp(msg->content_type,html,strlen(html))==0) - { - return TRUE; - } - if (IsTrustedDomain(msg->from_domain)) return FALSE; if (IsTrustedUser(msg->from_uname)) return FALSE; + if (ConfigInt(CONFIG_BLOCKHTML) && + strncmp(msg->content_type,html,strlen(html))==0) + return TRUE; + if (!(dom=GetDomain(msg->from_domain))) return FALSE; -- cgit v1.2.3