From f1658930db64af8fecff9c8697592f676114409c Mon Sep 17 00:00:00 2001
From: Ian C <ianc@noddybox.co.uk>
Date: Fri, 5 Dec 2003 19:38:37 +0000
Subject: Changed ordering so that HTML block doesn't apply to trusted messages

---
 src/Makefile |  5 +++--
 src/dbase.c  | 10 ++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 15285d1..481148b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -18,7 +18,7 @@
 # 
 # -------------------------------------------------------------------------
 # 
-# $Id: Makefile,v 1.2 2003-12-05 02:33:05 ianc Exp $
+# $Id: Makefile,v 1.3 2003-12-05 19:38:37 ianc Exp $
 # 
 
 CFLAGS +=	-g
@@ -60,7 +60,8 @@ kbs.o: /usr/include/limits.h /usr/include/sys/limits.h
 kbs.o: /usr/include/machine/_limits.h /usr/include/sys/syslimits.h
 kbs.o: /usr/include/stdio.h /usr/include/string.h /usr/include/strings.h
 kbs.o: /usr/include/stdarg.h /usr/include/time.h /usr/include/sys/timespec.h
-kbs.o: /usr/include/errno.h global.h config.h pop3.h msg.h dbase.h util.h
+kbs.o: /usr/include/errno.h global.h config.h pop3.h msg.h dbase.h dstring.h
+kbs.o: util.h
 pop3.o: /usr/include/stdlib.h /usr/include/sys/cdefs.h
 pop3.o: /usr/include/sys/_types.h /usr/include/machine/_types.h
 pop3.o: /usr/include/string.h /usr/include/strings.h /usr/include/stdio.h
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