Moved to new module init structure.

[citadel.git] / citadel / serv_sieve.c

diff --git a/citadel/serv_sieve.c b/citadel/serv_sieve.c
index 525bafb2da3e0d05f789f525e0780f924a277cad..508f8d2188ce71ecf06889f181de4704f235b7db 100644 (file)
--- a/citadel/serv_sieve.c
+++ b/citadel/serv_sieve.c
@@ -33,11 +33,9 @@
 #include <limits.h>
 #include "citadel.h"
 #include "server.h"
-#include "sysdep_decls.h"
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "serv_extensions.h"
 #include "room_ops.h"
 #include "policy.h"
 #include "database.h"
@@ -45,6 +43,10 @@
 #include "internet_addressing.h"
 #include "tools.h"
 
+
+#include "ctdl_module.h"
+
+
 #ifdef HAVE_LIBSIEVE
 
 #include "serv_sieve.h"
@@ -1247,9 +1249,13 @@ int serv_sieve_room(struct ctdlroom *room)
        return 0;
 }
 
+#endif /* HAVE_LIBSIEVE */
 
-char *serv_sieve_init(void)
+CTDL_MODULE_INIT(sieve)
 {
+
+#ifdef HAVE_LIBSIEVE
+
        ctdl_sieve_init();
        CtdlRegisterProtoHook(cmd_msiv, "MSIV", "Manage Sieve scripts");
 
@@ -1257,18 +1263,13 @@ char *serv_sieve_init(void)
 
         CtdlRegisterSessionHook(perform_sieve_processing, EVT_HOUSE);
 
-        /* return our Subversion id for the Log */
-       return "$Id$";
-}
-
 #else  /* HAVE_LIBSIEVE */
 
-char *serv_sieve_init(void)
-{
        lprintf(CTDL_INFO, "This server is missing libsieve.  Mailbox filtering will be disabled.\n");
 
-       /* return our Subversion id for the Log */
+#endif /* HAVE_LIBSIEVE */
+
+        /* return our Subversion id for the Log */
        return "$Id$";
 }
 
-#endif /* HAVE_LIBSIEVE */