* Killed off CtdlGetDynamicSymbol() and just put all the symbols in server.h

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index 92a02c12b23864b88e56e3583bd790ccef072cc2..e0adfa0a41dd4771d706a01db763cfeb3ca44465 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -48,7 +48,7 @@
 #include "citserver.h"
 #include "support.h"
 #include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
 #include "room_ops.h"
 #include "user_ops.h"
 #include "policy.h"
@@ -59,8 +59,6 @@
 #include "serv_pop3.h"
 #include "md5.h"
 
-long SYM_POP3;
-
 
 /*
  * This cleanup function blows away the temporary memory and files used by
@@ -144,7 +142,7 @@ void pop3_add_message(long msgnum, void *userdata) {
        POP3->msgs[POP3->num_msgs-1].temp = fp;
 
        CtdlRedirectOutput(fp, -1);
-       CtdlOutputMsg(msgnum, MT_RFC822, 0, 0, 1);
+       CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
        CtdlRedirectOutput(NULL, -1);
 
        POP3->msgs[POP3->num_msgs-1].rfc822_length = ftell(fp);
@@ -161,14 +159,14 @@ int pop3_grab_mailbox(void) {
         struct visit vbuf;
        int i;
 
-       if (getroom(&CC->quickroom, MAILROOM) != 0) return(-1);
+       if (getroom(&CC->room, MAILROOM) != 0) return(-1);
 
        /* Load up the messages */
-       CtdlForEachMessage(MSGS_ALL, 0L, (-63), NULL, NULL,
+       CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL,
                pop3_add_message, NULL);
 
        /* Figure out which are old and which are new */
-        CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+        CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
        POP3->lastseen = (-1);
        if (POP3->num_msgs) for (i=0; i<POP3->num_msgs; ++i) {
                if (is_msg_in_mset(vbuf.v_seen,
@@ -187,7 +185,7 @@ void pop3_login(void)
        msgs = pop3_grab_mailbox();
        if (msgs >= 0) {
                cprintf("+OK %s is logged in (%d messages)\r\n",
-                       CC->usersupp.fullname, msgs);
+                       CC->user.fullname, msgs);
                lprintf(9, "POP3 password login successful\n");
        }
        else {
@@ -232,13 +230,13 @@ void pop3_apop(char *argbuf)
        return;
    }
    
-   if (getuser(&CC->usersupp, CC->curr_user))
+   if (getuser(&CC->user, CC->curr_user))
    {
        cprintf("-ERR No such user.\r\n");
        return;
    }
    
-   make_apop_string(CC->usersupp.password, CC->cs_nonce, realdigest, sizeof realdigest);
+   make_apop_string(CC->user.password, CC->cs_nonce, realdigest, sizeof realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
        do_login();
@@ -447,14 +445,14 @@ void pop3_update(void) {
 
        /* Set last read pointer */
        if (POP3->num_msgs > 0) {
-               lgetuser(&CC->usersupp, CC->curr_user);
+               lgetuser(&CC->user, CC->curr_user);
 
-               CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+               CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
                snprintf(vbuf.v_seen, sizeof vbuf.v_seen, "*:%ld",
                        POP3->msgs[POP3->num_msgs-1].msgnum);
-               CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+               CtdlSetRelationship(&vbuf, &CC->user, &CC->room);
 
-               lputuser(&CC->usersupp);
+               lputuser(&CC->user);
        }
 
 }
@@ -616,9 +614,8 @@ void pop3_command_loop(void) {
 
 
 
-char *Dynamic_Module_Init(void)
+char *serv_pop3_init(void)
 {
-       SYM_POP3 = CtdlGetDynamicSymbol();
        CtdlRegisterServiceHook(config.c_pop3_port,
                                NULL,
                                pop3_greeting,