mk_module_init.sh now tests to see if echo supports -e and -E

[citadel.git] / citadel / serv_spam.c

diff --git a/citadel/serv_spam.c b/citadel/serv_spam.c
index 5e76ed316f4b7e8b512fc0e7d4cd35565bc2285f..64ad1f5cba100bdd7d9703c176e19f2422d2c8d9 100644 (file)
--- a/citadel/serv_spam.c
+++ b/citadel/serv_spam.c
@@ -36,12 +36,10 @@
 #include <sys/socket.h>
 #include "citadel.h"
 #include "server.h"
-#include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
 #include "control.h"
-#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -53,6 +51,9 @@
 #include "clientsocket.h"
 
 
+#include "ctdl_module.h"
+
+
 
 /*
  * Connect to the SpamAssassin server and scan a message.
@@ -136,8 +137,7 @@ int spam_assassin(struct CtdlMessage *msg) {
                if (msg->cm_fields['0'] != NULL) {
                        free(msg->cm_fields['0']);
                }
-               msg->cm_fields['0'] = strdup(
-                       "5.7.1 Message rejected by SpamAssassin");
+               msg->cm_fields['0'] = strdup("5.7.1 message rejected by spam filter");
        }
 
 bail:  close(sock);
@@ -146,8 +146,10 @@ bail:      close(sock);
 
 
 
-char *serv_spam_init(void)
+CTDL_MODULE_INIT(spam)
 {
        CtdlRegisterMessageHook(spam_assassin, EVT_SMTPSCAN);
+
+       /* return our Subversion id for the Log */
         return "$Id$";
 }