if (spam_strings_found) {
if (msg->cm_fields['0'] != NULL) {
- phree(msg->cm_fields['0']);
+ free(msg->cm_fields['0']);
}
- msg->cm_fields['0'] = strdoop("Unsolicited spam rejected");
+ msg->cm_fields['0'] = strdup("Unsolicited spam rejected");
return(spam_strings_found);
}
char buf[SIZ];
int is_spam = 0;
int sa;
+ char *msgtext;
+ size_t msglen;
/* For users who have authenticated to this server we never want to
* apply spam filtering, because presumably they're trustworthy.
/* Try them one by one until we get a working one */
for (sa=0; sa<num_sahosts; ++sa) {
- extract(buf, sahosts, sa);
- lprintf(9, "Connecting to SpamAssassin at <%s>\n", buf);
+ extract_token(buf, sahosts, sa, '|', sizeof buf);
+ lprintf(CTDL_INFO, "Connecting to SpamAssassin at <%s>\n", buf);
sock = sock_connect(buf, SPAMASSASSIN_PORT, "tcp");
- if (sock >= 0) lprintf(9, "Connected!\n");
+ if (sock >= 0) lprintf(CTDL_DEBUG, "Connected!\n");
}
if (sock < 0) {
}
/* Command */
- lprintf(9, "Transmitting command\n");
+ lprintf(CTDL_DEBUG, "Transmitting command\n");
sprintf(buf, "CHECK SPAMC/1.2\r\n\r\n");
sock_write(sock, buf, strlen(buf));
/* Message */
- CtdlRedirectOutput(NULL, sock);
+ CC->redirect_buffer = malloc(SIZ);
+ CC->redirect_len = 0;
+ CC->redirect_alloc = SIZ;
CtdlOutputPreLoadedMsg(msg, 0L, MT_RFC822, HEADERS_ALL, 0, 1);
- CtdlRedirectOutput(NULL, -1);
+ msgtext = CC->redirect_buffer;
+ msglen = CC->redirect_len;
+ CC->redirect_buffer = NULL;
+ CC->redirect_len = 0;
+ CC->redirect_alloc = 0;
+
+ sock_write(sock, msgtext, msglen);
+ free(msgtext);
/* Close one end of the socket connection; this tells SpamAssassin
* that we're done.
sock_shutdown(sock, SHUT_WR);
/* Response */
- lprintf(9, "Awaiting response\n");
+ lprintf(CTDL_DEBUG, "Awaiting response\n");
if (sock_gets(sock, buf) < 0) {
goto bail;
}
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (strncasecmp(buf, "SPAMD", 5)) {
goto bail;
}
if (sock_gets(sock, buf) < 0) {
goto bail;
}
- lprintf(9, "<%s\n", buf);
+ lprintf(CTDL_DEBUG, "<%s\n", buf);
if (!strncasecmp(buf, "Spam: True", 10)) {
is_spam = 1;
}
if (is_spam) {
if (msg->cm_fields['0'] != NULL) {
- phree(msg->cm_fields['0']);
+ free(msg->cm_fields['0']);
}
- msg->cm_fields['0'] = strdoop(
+ msg->cm_fields['0'] = strdup(
"5.7.1 Message rejected by SpamAssassin");
}