stable now but there are GIANT PIECES MISSING

[citadel.git] / citadel / modules / spam / serv_spam.c

diff --git a/citadel/modules/spam/serv_spam.c b/citadel/modules/spam/serv_spam.c
index df65ba6ef2a3e89449b5f24880c3d92a64a60030..479ea5fecf93be76c2edd76668bcabba212b2877 100644 (file)
--- a/citadel/modules/spam/serv_spam.c
+++ b/citadel/modules/spam/serv_spam.c
@@ -4,21 +4,15 @@
  * http://www.spamassassin.org (the SpamAssassin project is not in any way
  * affiliated with the Citadel project).
  *
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2015 by the citadel.org team
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #define SPAMASSASSIN_PORT       "783"
@@ -32,18 +26,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -70,7 +53,7 @@
 /*
  * Connect to the SpamAssassin server and scan a message.
  */
-int spam_assassin(struct CtdlMessage *msg) {
+int spam_assassin(struct CtdlMessage *msg, recptypes *recp) {
        int sock = (-1);
        char sahosts[SIZ];
        int num_sahosts;
@@ -141,37 +124,33 @@ int spam_assassin(struct CtdlMessage *msg) {
                 goto bail;
         }
         syslog(LOG_DEBUG, "<%s\n", buf);
-        syslog(LOG_DEBUG, "c_spam_flag_only setting %d\n", config.c_spam_flag_only);
-        if (config.c_spam_flag_only) {
-                syslog(LOG_DEBUG, "flag spam code used");
+        syslog(LOG_DEBUG, "c_spam_flag_only setting %d\n", CtdlGetConfigInt("c_spam_flag_only"));
+        if (CtdlGetConfigInt("c_spam_flag_only")) {
                int headerlen;
-               int newmsgsize;
-               int oldmsgsize;
-
+               char *cur;
                char sastatus[10];
                char sascore[10];
                char saoutof[10];
                int numscore;
 
+                syslog(LOG_DEBUG, "flag spam code used");
+
                 extract_token(sastatus, buf, 1, ' ', sizeof sastatus);
                 extract_token(sascore, buf, 3, ' ', sizeof sascore);
                 extract_token(saoutof, buf, 5, ' ', sizeof saoutof);
 
-               sprintf(buf,"X-Spam-Level: ");
-               char *cur = buf + 14;
+               memcpy(buf, HKEY("X-Spam-Level: "));
+               cur = buf + 14;
                for (numscore = atoi(sascore); numscore>0; numscore--)
                        *(cur++) = '*';
                *cur = '\0';
 
-               sprintf(cur,"\r\nX-Spam-Status: %s, score=%s required=%s\r\n", sastatus, sascore, saoutof);
-               headerlen = strlen(buf);
-               oldmsgsize = strlen(msg->cm_fields['M']) + 1;
-               newmsgsize = headerlen + oldmsgsize;
-
-               msg->cm_fields['M'] = realloc(msg->cm_fields['M'], newmsgsize);
+               headerlen  = cur - buf;
+               headerlen += snprintf(cur, (sizeof(buf) - headerlen), 
+                                    "\r\nX-Spam-Status: %s, score=%s required=%s\r\n",
+                                    sastatus, sascore, saoutof);
 
-               memmove(msg->cm_fields['M']+headerlen,msg->cm_fields['M'],oldmsgsize);
-               memcpy(msg->cm_fields['M'],buf,headerlen);
+               CM_PrependToField(msg, eMesageText, buf, headerlen);
 
        } else {
                 syslog(LOG_DEBUG, "reject spam code used");
@@ -180,10 +159,7 @@ int spam_assassin(struct CtdlMessage *msg) {
                }
 
                if (is_spam) {
-                       if (msg->cm_fields['0'] != NULL) {
-                               free(msg->cm_fields['0']);
-                       }
-                       msg->cm_fields['0'] = strdup("message rejected by spam filter");
+                       CM_SetField(msg, eErrorMsg, HKEY("message rejected by spam filter"));
                }
        }
 
@@ -202,6 +178,6 @@ CTDL_MODULE_INIT(spam)
                CtdlRegisterMessageHook(spam_assassin, EVT_SMTPSCAN);
        }
        
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
         return "spam";
 }