*** empty log message ***

[citadel.git] / citadel / serv_pop3.c

diff --git a/citadel/serv_pop3.c b/citadel/serv_pop3.c
index a9d77be7197a0eaa95f572112843acccde9e39a8..26851523b6502bc2a72920dc05daa14fdddb91ab 100644 (file)
--- a/citadel/serv_pop3.c
+++ b/citadel/serv_pop3.c
@@ -1,21 +1,16 @@
 /*
  * $Id$ 
  *
- * POP3 server for the Citadel/UX system
- * Copyright (C) 1998-2000 by Art Cancro and others.
+ * POP3 service for the Citadel/UX system
+ * Copyright (C) 1998-2001 by Art Cancro and others.
  * This code is released under the terms of the GNU General Public License.
  *
  * Current status of standards conformance:
  *
  * -> All required POP3 commands described in RFC1939 are implemented.
- * 
- * -> Nearly all of the optional commands in RFC1939 are also implemented.
- *    The only one missing is APOP, because it implements a "shared secret"
- *    method  of authentication which would require some major changes to the
- *    Citadel server core.
- *
- *    This is no longer true- APOP is implemented.
  *
+ * -> All optional POP3 commands described in RFC1939 are also implemented.
+ * 
  * -> The deprecated "LAST" command is included in this implementation, because
  *    there exist mail clients which insist on using it (such as Bynari
  *    TradeMail, and certain versions of Eudora).
@@ -53,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"
@@ -80,7 +75,10 @@ void pop3_cleanup_function(void) {
        lprintf(9, "Performing POP3 cleanup hook\n");
 
        if (POP3->num_msgs > 0) for (i=0; i<POP3->num_msgs; ++i) {
-               fclose(POP3->msgs[i].temp);
+               if (POP3->msgs[i].temp != NULL) {
+                       fclose(POP3->msgs[i].temp);
+                       POP3->msgs[i].temp = NULL;
+               }
        }
        if (POP3->msgs != NULL) phree(POP3->msgs);
 
@@ -146,7 +144,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);
@@ -163,14 +161,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,
@@ -189,7 +187,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 {
@@ -234,13 +232,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);
+   make_apop_string(CC->user.password, CC->cs_nonce, realdigest, sizeof realdigest);
    if (!strncasecmp(realdigest, userdigest, MD5_HEXSTRING_SIZE-1))
    {
        do_login();
@@ -449,14 +447,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);
-               sprintf(vbuf.v_seen, "*:%ld",
+               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);
        }
 
 }
@@ -547,7 +545,7 @@ void pop3_command_loop(void) {
                CC->kill_me = 1;
                return;
        }
-       lprintf(5, "citserver[%3d]: %s\r\n", CC->cs_pid, cmdbuf);
+       lprintf(5, "POP3: %s\r\n", cmdbuf);
        while (strlen(cmdbuf) < 5) strcat(cmdbuf, " ");
 
        if (!strncasecmp(cmdbuf, "NOOP", 4)) {
@@ -618,7 +616,7 @@ void pop3_command_loop(void) {
 
 
 
-char *Dynamic_Module_Init(void)
+char *serv_pop3_init(void)
 {
        SYM_POP3 = CtdlGetDynamicSymbol();
        CtdlRegisterServiceHook(config.c_pop3_port,