* Removed the built-in memory leak checker. It wasn't threadsafe and

[citadel.git] / citadel / serv_spam.c

diff --git a/citadel/serv_spam.c b/citadel/serv_spam.c
index 6922b0f091653260982441e0a71cd88545cf1fec..599869afd3e5ec1bc8d645533067082e029e1e9f 100644 (file)
--- a/citadel/serv_spam.c
+++ b/citadel/serv_spam.c
@@ -83,9 +83,9 @@ int spam_filter(struct CtdlMessage *msg) {
 
        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);
        }
 
@@ -118,10 +118,9 @@ int spam_assassin(struct CtdlMessage *msg) {
        /* 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);
+                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) break;
+                if (sock >= 0) lprintf(CTDL_DEBUG, "Connected!\n");
         }
 
        if (sock < 0) {
@@ -132,7 +131,7 @@ int spam_assassin(struct CtdlMessage *msg) {
        }
 
        /* 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));
 
@@ -147,28 +146,28 @@ int spam_assassin(struct CtdlMessage *msg) {
        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(
-                       "Message rejected by SpamAssassin");
+               msg->cm_fields['0'] = strdup(
+                       "5.7.1 Message rejected by SpamAssassin");
        }
 
 bail:  close(sock);