[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-437-g03b0cd6

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  03b0cd6f598cc592e1a28bc6f4a785bf48fc0967 (commit)
      from  38f5160b5a5638f14b190769cc6f698de6984fb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 03b0cd6f598cc592e1a28bc6f4a785bf48fc0967
Author: GetAway <get...@t-...>
Date:   Fri Nov 7 17:28:58 2014 +0100

    tuxmaild: increase spam filter entries this needs only a little bit more of RAM
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/plugins/tuxmail/daemon/tuxmaild.c b/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
index bf2837e..a7351ba 100644
--- a/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
+++ b/tuxbox/plugins/tuxmail/daemon/tuxmaild.c
@@ -547,7 +547,7 @@ void ReadSpamList()
 	{
 		memset(spamfilter, 0, sizeof(spamfilter));
 
-		while(fgets(line_buffer, sizeof(line_buffer), fd_spam) && spam_entries < 100)
+		while(fgets(line_buffer, sizeof(line_buffer), fd_spam) && spam_entries < MAXSPAM)
 		{
 			if(sscanf(line_buffer, "%s", spamfilter[spam_entries].address) == 1)
 			{
@@ -4800,7 +4800,7 @@ void SigHandler(int signal)
 
 int main(int argc, char **argv)
 {
-	char cvs_revision[] = "$Revision: 1.52 $";
+	char cvs_revision[] = "$Revision: 1.53 $";
 	int param, nodelay = 0, account, mailstatus, unread_mailstatus;
 	pthread_t thread_id;
 	void *thread_result = 0;
diff --git a/tuxbox/plugins/tuxmail/daemon/tuxmaild.h b/tuxbox/plugins/tuxmail/daemon/tuxmaild.h
index 06c024f..f067e9f 100644
--- a/tuxbox/plugins/tuxmail/daemon/tuxmaild.h
+++ b/tuxbox/plugins/tuxmail/daemon/tuxmaild.h
@@ -140,6 +140,7 @@ enum
 };
 
 #define MAXMAIL 100													// should be the same in tuxmail.h
+#define MAXSPAM 512
 
 // account database
 
@@ -171,7 +172,7 @@ struct
 {
 	char address[64];
 
-}spamfilter[100];
+}spamfilter[MAXSPAM];
 
 // waveheader
 

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/plugins/tuxmail/daemon/tuxmaild.c |    4 ++--
 tuxbox/plugins/tuxmail/daemon/tuxmaild.h |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


-- 
Tuxbox-GIT: apps