From: NurPech <nurpech@nurpech.de>
Date: Mon, 20 May 2013 03:02:32 +0000 (+0200)
Subject: Merge branch 'master' into SpamServ
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=360a03c99e897a8ee119827be098669d7cea40b8

Merge branch 'master' into SpamServ
---

360a03c99e897a8ee119827be098669d7cea40b8
diff --cc src/spamserv.c
index 9987398,aaf17b7..2cbd3e8
--- a/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;
 +                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(object, spamserv_saxdb_read_shitlist, cInfo);
++                	dict_foreach(badwords, spamserv_saxdb_read_shitlist, cInfo);
  			}
  		}
  		else