Moved to new module init structure.

[citadel.git] / citadel / serv_managesieve.c

diff --git a/citadel/serv_managesieve.c b/citadel/serv_managesieve.c
index 9b53968e13cc4c09ef41d5c394ec4a8f3e60a76c..c43d8aa192ceac085610b4da2eba4f147f98ac22 100644 (file)
--- a/citadel/serv_managesieve.c
+++ b/citadel/serv_managesieve.c
@@ -40,12 +40,10 @@
 #include <arpa/inet.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"
@@ -68,6 +66,11 @@
 #include "snprintf.h"
 #endif
 
+
+#include "ctdl_module.h"
+
+
+
 #ifdef HAVE_LIBSIEVE
 
 #include "serv_sieve.h"
@@ -571,27 +574,27 @@ void managesieve_command_loop(void) {
 }
 
 
+#endif /* HAVE_LIBSIEVE */
 
-char *serv_managesieve_init(void)
+CTDL_MODULE_INIT(managesieve)
 {
 
+#ifdef HAVE_LIBSIEVE
+
        CtdlRegisterServiceHook(config.c_managesieve_port,      /* MGSVE */
                                NULL,
                                managesieve_greeting,
                                managesieve_command_loop,
                                NULL);
 
-       return "$Id$";
-}
-
 #else  /* HAVE_LIBSIEVE */
 
-char *serv_managesieve_init(void)
-{
        lprintf(CTDL_INFO, "This server is missing libsieve.  Managesieve protocol is disabled..\n");
 
+#endif /* HAVE_LIBSIEVE */
+
        /* return our Subversion id for the Log */
        return "$Id$";
 }
 
-#endif /* HAVE_LIBSIEVE */
+