Moved to new module init structure.

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 17255d1d16b65ee4e7c7362f90b7784de79d76df..c49c5cad98da96edb683b99bcc1135a0697fc2f9 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -43,11 +43,9 @@
 #include <ctype.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 "user_ops.h"
 #include "policy.h"
@@ -63,6 +61,9 @@
 #endif
 
 
+#include "ctdl_module.h"
+
+
 
 /*
  * This cleanup function blows away the temporary memory and files used by
@@ -122,7 +123,7 @@ void pop3_user(char *argbuf) {
        striplt(username);
 
        /* lprintf(CTDL_DEBUG, "Trying <%s>\n", username); */
-       if (CtdlLoginExistingUser(username) == login_ok) {
+       if (CtdlLoginExistingUser(NULL, username) == login_ok) {
                cprintf("+OK Password required for %s\r\n", username);
        }
        else {
@@ -242,7 +243,7 @@ void pop3_apop(char *argbuf)
    memset(userdigest, MD5_HEXSTRING_SIZE, 0);
    strncpy(userdigest, sptr, MD5_HEXSTRING_SIZE-1);
    
-   if (CtdlLoginExistingUser(username) != login_ok)
+   if (CtdlLoginExistingUser(NULL, username) != login_ok)
    {
        cprintf("-ERR No such user.\r\n");
        return;
@@ -710,7 +711,7 @@ void pop3_command_loop(void) {
 
 
 
-char *serv_pop3_init(void)
+CTDL_MODULE_INIT(pop3)
 {
        CtdlRegisterServiceHook(config.c_pop3_port,
                                NULL,
@@ -725,5 +726,7 @@ char *serv_pop3_init(void)
                                NULL);
 #endif
        CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP);
+
+       /* return our Subversion id for the Log */
        return "$Id$";
 }