* arriving via SMTP. For more information on SpamAssassin, visit
* 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
+ *
+ * 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 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"
goto bail;
}
CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
- if (!strncasecmp(buf, "Spam: True", 10)) {
- is_spam = 1;
- }
+ CtdlLogPrintf(CTDL_DEBUG, "c_spam_flag_only setting %d\n", config.c_spam_flag_only);
+ if (config.c_spam_flag_only) {
+ CtdlLogPrintf(CTDL_DEBUG, "flag spam code used");
+ int headerlen;
+ int newmsgsize;
+ int oldmsgsize;
+
+ char sastatus[10];
+ char sascore[10];
+ char saoutof[10];
+ int numscore;
+
+ 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;
+ 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);
+
+ memmove(msg->cm_fields['M']+headerlen,msg->cm_fields['M'],oldmsgsize);
+ memcpy(msg->cm_fields['M'],buf,headerlen);
+
+ } else {
+ CtdlLogPrintf(CTDL_DEBUG, "reject spam code used");
+ if (!strncasecmp(buf, "Spam: True", 10)) {
+ is_spam = 1;
+ }
- if (is_spam) {
- if (msg->cm_fields['0'] != NULL) {
- free(msg->cm_fields['0']);
+ if (is_spam) {
+ if (msg->cm_fields['0'] != NULL) {
+ free(msg->cm_fields['0']);
+ }
+ msg->cm_fields['0'] = strdup("message rejected by spam filter");
}
- msg->cm_fields['0'] = strdup("message rejected by spam filter");
}
bail: close(sock);