* make the write -1 aware here too.

[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 0744fe28333f7c5b0f3b6af7bfb32fe4a08bb540..840fd749f330b03fb635c2b9484d53cb39f5e084 100644 (file)
--- a/citadel/modules/spam/serv_spam.c
+++ b/citadel/modules/spam/serv_spam.c
@@ -57,7 +57,6 @@
 #include "support.h"
 #include "config.h"
 #include "control.h"
-#include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
 #include "database.h"
@@ -111,7 +110,7 @@ int spam_assassin(struct CtdlMessage *msg) {
        /* Command */
        CtdlLogPrintf(CTDL_DEBUG, "Transmitting command\n");
        sprintf(buf, "CHECK SPAMC/1.2\r\n\r\n");
-       sock_write(sock, buf, strlen(buf));
+       sock_write(&sock, buf, strlen(buf));
 
        /* Message */
        CC->redirect_buffer = malloc(SIZ);
@@ -124,24 +123,25 @@ int spam_assassin(struct CtdlMessage *msg) {
        CC->redirect_len = 0;
        CC->redirect_alloc = 0;
 
-       sock_write(sock, msgtext, msglen);
+       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);
+       if (sock != -1)
+               sock_shutdown(sock, SHUT_WR);
        
        /* Response */
        CtdlLogPrintf(CTDL_DEBUG, "Awaiting response\n");
-        if (sock_getln(sock, buf, sizeof buf) < 0) {
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
         CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);
        if (strncasecmp(buf, "SPAMD", 5)) {
                goto bail;
        }
-        if (sock_getln(sock, buf, sizeof buf) < 0) {
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
                 goto bail;
         }
         CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf);