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

[citadel.git] / citadel / serv_smtp.c

diff --git a/citadel/serv_smtp.c b/citadel/serv_smtp.c
index 65476a9f4515d1c5fc2e6cc4baa7f12001da25f3..c2329ba9168cf958524ed78e8a568efdd842bc16 100644 (file)
--- a/citadel/serv_smtp.c
+++ b/citadel/serv_smtp.c
@@ -57,12 +57,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"
@@ -86,6 +84,11 @@
 #include "snprintf.h"
 #endif
 
+
+#include "ctdl_module.h"
+
+
+
 struct citsmtp {               /* Information about the current session */
        int command_state;
        char helo_node[SIZ];
@@ -1810,9 +1813,8 @@ void smtp_cleanup_function(void) {
 
 
 
-char *serv_smtp_init(void)
+CTDL_MODULE_INIT(smtp)
 {
-
        CtdlRegisterServiceHook(config.c_smtp_port,     /* SMTP MTA */
                                NULL,
                                smtp_mta_greeting,
@@ -1834,16 +1836,16 @@ char *serv_smtp_init(void)
                                NULL);
 
        CtdlRegisterServiceHook(0,                      /* local LMTP */
-                                                       file_lmtp_socket,
-                                                       lmtp_greeting,
-                                                       smtp_command_loop,
-                                                       NULL);
+                               file_lmtp_socket,
+                               lmtp_greeting,
+                               smtp_command_loop,
+                               NULL);
 
        CtdlRegisterServiceHook(0,                      /* local LMTP */
-                                                       file_lmtp_unfiltered_socket,
-                                                       lmtp_unfiltered_greeting,
-                                                       smtp_command_loop,
-                                                       NULL);
+                               file_lmtp_unfiltered_socket,
+                               lmtp_unfiltered_greeting,
+                               smtp_command_loop,
+                               NULL);
 
        smtp_init_spoolout();
        CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER);