SMTP-Relaying: implement a method to choose a relay by sender email address or username

[citadel.git] / citadel / modules / pop3 / serv_pop3.c

diff --git a/citadel/modules/pop3/serv_pop3.c b/citadel/modules/pop3/serv_pop3.c
index ec98569c24c1d295718e5cd4a358fe01c9f35ecf..97681da8366e36b2fa5be74b9b936b79af9f9cda 100644 (file)
--- a/citadel/modules/pop3/serv_pop3.c
+++ b/citadel/modules/pop3/serv_pop3.c
@@ -1,21 +1,21 @@
 /*
  * POP3 service for the Citadel system
  *
- * Copyright (c) 1998-2009 by the citadel.org team
+ * Copyright (c) 1998-2012 by the citadel.org team
  *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3.
+ *  
+ *  
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  
+ *  
+ *  
  *
  * Current status of standards conformance:
  *
@@ -110,9 +110,9 @@ void pop3s_greeting(void) {
 
 /* kill session if no crypto */
 #ifdef HAVE_OPENSSL
-       if (!CC->redirect_ssl) CC->kill_me = 1;
+       if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO;
 #else
-       CC->kill_me = 1;
+       CC->kill_me = KILLME_NO_CRYPTO;
 #endif
 
        pop3_greeting();
@@ -166,7 +166,14 @@ void pop3_add_message(long msgnum, void *userdata) {
        GetMetaData(&smi, msgnum);
        if (smi.meta_rfc822_length <= 0L) {
                CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-               CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
+
+               CtdlOutputMsg(msgnum,
+                             MT_RFC822,
+                             HEADERS_ALL,
+                             0, 1, NULL,
+                             SUPPRESS_ENV_TO,
+                             NULL, NULL);
+
                smi.meta_rfc822_length = StrLength(CC->redirect_buffer);
                FreeStrBuf(&CC->redirect_buffer); /* TODO: WHEW, all this for just knowing the length???? */
                PutMetaData(&smi);
@@ -324,9 +331,9 @@ void pop3_retr(char *argbuf) {
 
        cprintf("+OK Message %d:\r\n", which_one);
        CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
-               MT_RFC822, HEADERS_ALL, 0, 1, NULL,
-               (ESC_DOT|SUPPRESS_ENV_TO)
-       );
+                     MT_RFC822, HEADERS_ALL, 0, 1, NULL,
+                     (ESC_DOT|SUPPRESS_ENV_TO),
+                     NULL, NULL);
        cprintf(".\r\n");
 }
 
@@ -356,7 +363,14 @@ void pop3_top(char *argbuf) {
        }
 
        CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
-       CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL, SUPPRESS_ENV_TO);
+
+       CtdlOutputMsg(POP3->msgs[which_one - 1].msgnum,
+                     MT_RFC822,
+                     HEADERS_ALL,
+                     0, 1, NULL,
+                     SUPPRESS_ENV_TO,
+                     NULL, NULL);
+
        msgtext = CC->redirect_buffer;
        CC->redirect_buffer = NULL;
 
@@ -569,8 +583,8 @@ void pop3_command_loop(void) {
        time(&CC->lastcmd);
        memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */
        if (client_getln(cmdbuf, sizeof cmdbuf) < 1) {
-               syslog(LOG_ERR, "Client disconnected: ending session.");
-               CC->kill_me = 1;
+               syslog(LOG_ERR, "POP3 client disconnected: ending session.");
+               CC->kill_me = KILLME_CLIENT_DISCONNECTED;
                return;
        }
        if (!strncasecmp(cmdbuf, "PASS", 4)) {
@@ -592,7 +606,7 @@ void pop3_command_loop(void) {
        else if (!strncasecmp(cmdbuf, "QUIT", 4)) {
                cprintf("+OK Goodbye...\r\n");
                pop3_update();
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
                return;
        }
 
@@ -616,7 +630,7 @@ void pop3_command_loop(void) {
        
        else if (CC->nologin) {
                cprintf("-ERR System busy, try later.\r\n");
-               CC->kill_me = 1;
+               CC->kill_me = KILLME_NOLOGIN;
        }
 
        else if (!strncasecmp(cmdbuf, "LIST", 4)) {
@@ -679,9 +693,9 @@ CTDL_MODULE_INIT(pop3)
                                        NULL,
                                        CitadelServicePop3S);
 #endif
-               CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP);
+               CtdlRegisterSessionHook(pop3_cleanup_function, EVT_STOP, PRIO_STOP + 30);
        }
        
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
        return "pop3";
 }