Merge branch 'master' into SpamServ

diff --cc src/spamserv.c
index 9987398772bc4c98737380d9e018fa9b569f37c0,aaf17b7178896829ee26038b11faab8f4d33edc8..2cbd3e8a0bedc758a0d11e14342865bf7ab40e28
--- 1/src/spamserv.c
--- 2/src/spamserv.c
+++ b/src/spamserv.c
@@@ -2242,12 -1880,6 +2242,12 @@@ spamserv_saxdb_read(struct dict *databa
                                else
                                        cInfo->suspend_expiry = expiry;                 
                  cInfo->exceptlevel=exceptlevel;
-                       dict_foreach(object, spamserv_saxdb_read_shitlist, cInfo);
 +                cInfo->badwords = dict_new();
 +                str = database_get_data(hir->d.object, KEY_LASTBADWORDID, RECDB_QSTRING);
 +                badwordid = str ? atoi(str) : 0;
 +                cInfo->last_badword_id = badwordid;
 +                if ((badwords = database_get_data(hir->d.object, KEY_BADWORDS, RECDB_OBJECT)))
++                      dict_foreach(badwords, spamserv_saxdb_read_shitlist, cInfo);
                        }
                }
                else