X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=6c7480adfa0d0fddcd0fc02601deb58e804b34d6;hb=3061bf4d898bdfb0e0dfe294676b2ac6274d0cb4;hp=34b14cde8dbc1458ca1a5d3c9656ee0f113faef8;hpb=56cc4fc2c5b5f836147c78c9037a21fe505fd771;p=citadel.git diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c index 34b14cde8..6c7480adf 100644 --- a/citadel/modules/smtp/serv_smtp.c +++ b/citadel/modules/smtp/serv_smtp.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * This module is an SMTP and ESMTP implementation for the Citadel system. * It is compliant with all of the following: * @@ -22,12 +20,28 @@ * The VRFY and EXPN commands have been removed from this implementation * because nobody uses these commands anymore, except for spammers. * + * Copyright (c) 1998-2009 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 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 */ #include "sysdep.h" #include #include #include +#include #include #include #include @@ -60,9 +74,7 @@ #include "support.h" #include "config.h" #include "control.h" -#include "room_ops.h" #include "user_ops.h" -#include "policy.h" #include "database.h" #include "msgbase.h" #include "internet_addressing.h" @@ -81,21 +93,7 @@ #include "ctdl_module.h" - - -struct citsmtp { /* Information about the current session */ - int command_state; - char helo_node[SIZ]; - char from[SIZ]; - char recipients[SIZ]; - int number_of_recipients; - int delivery_mode; - int message_originated_locally; - int is_lmtp; - int is_unfiltered; - int is_msa; -}; - +#include "smtp_util.h" enum { /* Command states for login authentication */ smtp_command, smtp_user, @@ -103,10 +101,7 @@ enum { /* Command states for login authentication */ smtp_plain }; -#define SMTP ((struct citsmtp *)CC->session_specific_data) - -int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */ @@ -120,25 +115,27 @@ int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */ */ void smtp_greeting(int is_msa) { + citsmtp *sSMTP; char message_to_spammer[1024]; strcpy(CC->cs_clientname, "SMTP session"); CC->internal_pgm = 1; CC->cs_flags |= CS_STEALTH; - CC->session_specific_data = malloc(sizeof(struct citsmtp)); - memset(SMTP, 0, sizeof(struct citsmtp)); - SMTP->is_msa = is_msa; + CC->session_specific_data = malloc(sizeof(citsmtp)); + memset(SMTP, 0, sizeof(citsmtp)); + sSMTP = SMTP; + sSMTP->is_msa = is_msa; /* If this config option is set, reject connections from problem * addresses immediately instead of after they execute a RCPT */ - if ( (config.c_rbl_at_greeting) && (SMTP->is_msa == 0) ) { + if ( (config.c_rbl_at_greeting) && (sSMTP->is_msa == 0) ) { if (rbl_check(message_to_spammer)) { if (CtdlThreadCheckStop()) cprintf("421 %s\r\n", message_to_spammer); else cprintf("550 %s\r\n", message_to_spammer); - CC->kill_me = 1; + CC->kill_me = KILLME_SPAMMER; /* no need to free_recipients(valid), it's not allocated yet */ return; } @@ -150,7 +147,7 @@ void smtp_greeting(int is_msa) cprintf("500 Too many users are already online (maximum is %d)\r\n", config.c_maxsessions ); - CC->kill_me = 1; + CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED; /* no need to free_recipients(valid), it's not allocated yet */ return; } @@ -168,7 +165,7 @@ void smtp_greeting(int is_msa) void smtps_greeting(void) { CtdlModuleStartCryptoMsgs(NULL, NULL, NULL); #ifdef HAVE_OPENSSL - if (!CC->redirect_ssl) CC->kill_me = 1; /* kill session if no crypto */ + if (!CC->redirect_ssl) CC->kill_me = KILLME_NO_CRYPTO; /* kill session if no crypto */ #endif smtp_greeting(0); } @@ -186,7 +183,10 @@ void smtp_msa_greeting(void) { * LMTP is like SMTP but with some extra bonus footage added. */ void lmtp_greeting(void) { + citsmtp *sSMTP; + smtp_greeting(0); + sSMTP = SMTP; SMTP->is_lmtp = 1; } @@ -203,9 +203,12 @@ void smtp_mta_greeting(void) { * We also have an unfiltered LMTP socket that bypasses spam filters. */ void lmtp_unfiltered_greeting(void) { + citsmtp *sSMTP; + smtp_greeting(0); - SMTP->is_lmtp = 1; - SMTP->is_unfiltered = 1; + sSMTP = SMTP; + sSMTP->is_lmtp = 1; + sSMTP->is_unfiltered = 1; } @@ -214,7 +217,7 @@ void lmtp_unfiltered_greeting(void) { */ void smtp_auth_greeting(void) { cprintf("235 Hello, %s\r\n", CC->user.fullname); - CtdlLogPrintf(CTDL_NOTICE, "SMTP authenticated %s\n", CC->user.fullname); + syslog(LOG_NOTICE, "SMTP authenticated %s\n", CC->user.fullname); CC->internal_pgm = 0; CC->cs_flags &= ~CS_STEALTH; } @@ -226,22 +229,23 @@ void smtp_auth_greeting(void) { * which_command: 0=HELO, 1=EHLO, 2=LHLO */ void smtp_hello(char *argbuf, int which_command) { + citsmtp *sSMTP = SMTP; - safestrncpy(SMTP->helo_node, argbuf, sizeof SMTP->helo_node); + safestrncpy(sSMTP->helo_node, argbuf, sizeof sSMTP->helo_node); - if ( (which_command != 2) && (SMTP->is_lmtp) ) { + if ( (which_command != 2) && (sSMTP->is_lmtp) ) { cprintf("500 Only LHLO is allowed when running LMTP\r\n"); return; } - if ( (which_command == 2) && (SMTP->is_lmtp == 0) ) { + if ( (which_command == 2) && (sSMTP->is_lmtp == 0) ) { cprintf("500 LHLO is only allowed when running LMTP\r\n"); return; } if (which_command == 0) { cprintf("250 Hello %s (%s [%s])\r\n", - SMTP->helo_node, + sSMTP->helo_node, CC->cs_host, CC->cs_addr ); @@ -249,7 +253,7 @@ void smtp_hello(char *argbuf, int which_command) { else { if (which_command == 1) { cprintf("250-Hello %s (%s [%s])\r\n", - SMTP->helo_node, + sSMTP->helo_node, CC->cs_host, CC->cs_addr ); @@ -267,7 +271,7 @@ void smtp_hello(char *argbuf, int which_command) { * the SMTP-MSA port, not on the SMTP-MTA port, due to * questionable reliability of TLS in certain sending MTA's. */ - if ( (!CC->redirect_ssl) && (SMTP->is_msa) ) { + if ( (!CC->redirect_ssl) && (sSMTP->is_msa) ) { cprintf("250-STARTTLS\r\n"); } #endif /* HAVE_OPENSSL */ @@ -295,17 +299,18 @@ void smtp_help(void) { void smtp_get_user(char *argbuf) { char buf[SIZ]; char username[SIZ]; + citsmtp *sSMTP = SMTP; CtdlDecodeBase64(username, argbuf, SIZ); - /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", username); */ + /* syslog(LOG_DEBUG, "Trying <%s>\n", username); */ if (CtdlLoginExistingUser(NULL, username) == login_ok) { CtdlEncodeBase64(buf, "Password:", 9, 0); cprintf("334 %s\r\n", buf); - SMTP->command_state = smtp_password; + sSMTP->command_state = smtp_password; } else { cprintf("500 No such user.\r\n"); - SMTP->command_state = smtp_command; + sSMTP->command_state = smtp_command; } } @@ -315,10 +320,12 @@ void smtp_get_user(char *argbuf) { */ void smtp_get_pass(char *argbuf) { char password[SIZ]; + long len; - CtdlDecodeBase64(password, argbuf, SIZ); - /* CtdlLogPrintf(CTDL_DEBUG, "Trying <%s>\n", password); */ - if (CtdlTryPassword(password) == pass_ok) { + memset(password, 0, sizeof(password)); + len = CtdlDecodeBase64(password, argbuf, SIZ); + /* syslog(LOG_DEBUG, "Trying <%s>\n", password); */ + if (CtdlTryPassword(password, len) == pass_ok) { smtp_auth_greeting(); } else { @@ -337,11 +344,14 @@ void smtp_try_plain(char *encoded_authstring) { char user[256]; char pass[256]; int result; + long len; CtdlDecodeBase64(decoded_authstring, encoded_authstring, strlen(encoded_authstring) ); safestrncpy(ident, decoded_authstring, sizeof ident); safestrncpy(user, &decoded_authstring[strlen(ident) + 1], sizeof user); - safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass); + len = safestrncpy(pass, &decoded_authstring[strlen(ident) + strlen(user) + 2], sizeof pass); + if (len == -1) + len = sizeof(pass) - 1; SMTP->command_state = smtp_command; @@ -353,7 +363,7 @@ void smtp_try_plain(char *encoded_authstring) { } if (result == login_ok) { - if (CtdlTryPassword(pass) == pass_ok) { + if (CtdlTryPassword(pass, len) == pass_ok) { smtp_auth_greeting(); return; } @@ -421,16 +431,17 @@ void smtp_auth(char *argbuf) { void smtp_rset(int do_response) { int is_lmtp; int is_unfiltered; + citsmtp *sSMTP = SMTP; /* * Our entire SMTP state is discarded when a RSET command is issued, * but we need to preserve this one little piece of information, so * we save it for later. */ - is_lmtp = SMTP->is_lmtp; - is_unfiltered = SMTP->is_unfiltered; + is_lmtp = sSMTP->is_lmtp; + is_unfiltered = sSMTP->is_unfiltered; - memset(SMTP, 0, sizeof(struct citsmtp)); + memset(sSMTP, 0, sizeof(citsmtp)); /* * It is somewhat ambiguous whether we want to log out when a RSET @@ -446,8 +457,8 @@ void smtp_rset(int do_response) { /* * Reinstate this little piece of information we saved (see above). */ - SMTP->is_lmtp = is_lmtp; - SMTP->is_unfiltered = is_unfiltered; + sSMTP->is_lmtp = is_lmtp; + sSMTP->is_unfiltered = is_unfiltered; if (do_response) { cprintf("250 Zap!\r\n"); @@ -459,30 +470,25 @@ void smtp_rset(int do_response) { * after the DATA command finishes. */ void smtp_data_clear(void) { - strcpy(SMTP->from, ""); - strcpy(SMTP->recipients, ""); - SMTP->number_of_recipients = 0; - SMTP->delivery_mode = 0; - SMTP->message_originated_locally = 0; -} - -const char *smtp_get_Recipients(void) -{ - if (SMTP == NULL) - return NULL; - else return SMTP->from; + citsmtp *sSMTP = SMTP; + strcpy(sSMTP->from, ""); + strcpy(sSMTP->recipients, ""); + sSMTP->number_of_recipients = 0; + sSMTP->delivery_mode = 0; + sSMTP->message_originated_locally = 0; } /* - * Implements the "MAIL From:" command + * Implements the "MAIL FROM:" command */ void smtp_mail(char *argbuf) { char user[SIZ]; char node[SIZ]; char name[SIZ]; + citsmtp *sSMTP = SMTP; - if (!IsEmptyStr(SMTP->from)) { + if (!IsEmptyStr(sSMTP->from)) { cprintf("503 Only one sender permitted\r\n"); return; } @@ -492,10 +498,10 @@ void smtp_mail(char *argbuf) { return; } - strcpy(SMTP->from, &argbuf[5]); - striplt(SMTP->from); - if (haschar(SMTP->from, '<') > 0) { - stripallbut(SMTP->from, '<', '>'); + strcpy(sSMTP->from, &argbuf[5]); + striplt(sSMTP->from); + if (haschar(sSMTP->from, '<') > 0) { + stripallbut(sSMTP->from, '<', '>'); } /* We used to reject empty sender names, until it was brought to our @@ -504,21 +510,21 @@ void smtp_mail(char *argbuf) { * address so we don't have to contend with the empty string causing * other code to fail when it's expecting something there. */ - if (IsEmptyStr(SMTP->from)) { - strcpy(SMTP->from, "someone@example.com"); + if (IsEmptyStr(sSMTP->from)) { + strcpy(sSMTP->from, "someone@example.com"); } /* If this SMTP connection is from a logged-in user, force the 'from' * to be the user's Internet e-mail address as Citadel knows it. */ if (CC->logged_in) { - safestrncpy(SMTP->from, CC->cs_inet_email, sizeof SMTP->from); - cprintf("250 Sender ok <%s>\r\n", SMTP->from); - SMTP->message_originated_locally = 1; + safestrncpy(sSMTP->from, CC->cs_inet_email, sizeof sSMTP->from); + cprintf("250 Sender ok <%s>\r\n", sSMTP->from); + sSMTP->message_originated_locally = 1; return; } - else if (SMTP->is_lmtp) { + else if (sSMTP->is_lmtp) { /* Bypass forgery checking for LMTP */ } @@ -526,10 +532,10 @@ void smtp_mail(char *argbuf) { * this system (unless, of course, c_allow_spoofing is enabled) */ else if (config.c_allow_spoofing == 0) { - process_rfc822_addr(SMTP->from, user, node, name); + process_rfc822_addr(sSMTP->from, user, node, name); if (CtdlHostAlias(node) != hostalias_nomatch) { cprintf("550 You must log in to send mail from %s\r\n", node); - strcpy(SMTP->from, ""); + strcpy(sSMTP->from, ""); return; } } @@ -546,8 +552,9 @@ void smtp_rcpt(char *argbuf) { char recp[1024]; char message_to_spammer[SIZ]; struct recptypes *valid = NULL; + citsmtp *sSMTP = SMTP; - if (IsEmptyStr(SMTP->from)) { + if (IsEmptyStr(sSMTP->from)) { cprintf("503 Need MAIL before RCPT\r\n"); return; } @@ -557,9 +564,9 @@ void smtp_rcpt(char *argbuf) { return; } - if ( (SMTP->is_msa) && (!CC->logged_in) ) { + if ( (sSMTP->is_msa) && (!CC->logged_in) ) { cprintf("550 You must log in to send mail on this port.\r\n"); - strcpy(SMTP->from, ""); + strcpy(sSMTP->from, ""); return; } @@ -567,14 +574,14 @@ void smtp_rcpt(char *argbuf) { striplt(recp); stripallbut(recp, '<', '>'); - if ( (strlen(recp) + strlen(SMTP->recipients) + 1 ) >= SIZ) { + if ( (strlen(recp) + strlen(sSMTP->recipients) + 1 ) >= SIZ) { cprintf("452 Too many recipients\r\n"); return; } /* RBL check */ if ( (!CC->logged_in) /* Don't RBL authenticated users */ - && (!SMTP->is_lmtp) ) { /* Don't RBL LMTP clients */ + && (!sSMTP->is_lmtp) ) { /* Don't RBL LMTP clients */ if (config.c_rbl_at_greeting == 0) { /* Don't RBL again if we already did it */ if (rbl_check(message_to_spammer)) { if (CtdlThreadCheckStop()) @@ -589,7 +596,7 @@ void smtp_rcpt(char *argbuf) { valid = validate_recipients(recp, smtp_get_Recipients (), - (SMTP->is_lmtp)? POST_LMTP: + (sSMTP->is_lmtp)? POST_LMTP: (CC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL); if (valid->num_error != 0) { @@ -609,8 +616,8 @@ void smtp_rcpt(char *argbuf) { } if (valid->num_internet > 0) { - if ( (SMTP->message_originated_locally == 0) - && (SMTP->is_lmtp == 0) ) { + if ( (sSMTP->message_originated_locally == 0) + && (sSMTP->is_lmtp == 0) ) { cprintf("551 <%s> - relaying denied\r\n", recp); free_recipients(valid); return; @@ -618,11 +625,11 @@ void smtp_rcpt(char *argbuf) { } cprintf("250 RCPT ok <%s>\r\n", recp); - if (!IsEmptyStr(SMTP->recipients)) { - strcat(SMTP->recipients, ","); + if (!IsEmptyStr(sSMTP->recipients)) { + strcat(sSMTP->recipients, ","); } - strcat(SMTP->recipients, recp); - SMTP->number_of_recipients += 1; + strcat(sSMTP->recipients, recp); + sSMTP->number_of_recipients += 1; if (valid != NULL) { free_recipients(valid); } @@ -635,7 +642,8 @@ void smtp_rcpt(char *argbuf) { * Implements the DATA command */ void smtp_data(void) { - char *body; + StrBuf *body; + char *defbody; //TODO: remove me struct CtdlMessage *msg = NULL; long msgnum = (-1L); char nowstamp[SIZ]; @@ -643,13 +651,14 @@ void smtp_data(void) { int scan_errors; int i; char result[SIZ]; + citsmtp *sSMTP = SMTP; - if (IsEmptyStr(SMTP->from)) { + if (IsEmptyStr(sSMTP->from)) { cprintf("503 Need MAIL command first.\r\n"); return; } - if (SMTP->number_of_recipients < 1) { + if (sSMTP->number_of_recipients < 1) { cprintf("503 Need RCPT command first.\r\n"); return; } @@ -657,25 +666,37 @@ void smtp_data(void) { cprintf("354 Transmit message now - terminate with '.' by itself\r\n"); datestring(nowstamp, sizeof nowstamp, time(NULL), DATESTRING_RFC822); - body = malloc(4096); - - if (body != NULL) snprintf(body, 4096, - "Received: from %s (%s [%s])\n" - " by %s; %s\n", - SMTP->helo_node, - CC->cs_host, - CC->cs_addr, - config.c_fqdn, - nowstamp); - - body = CtdlReadMessageBody(".", config.c_maxmsglen, body, 1, 0); + defbody = malloc(4096); + + if (defbody != NULL) { + if (sSMTP->is_lmtp && (CC->cs_UDSclientUID != -1)) { + snprintf(defbody, 4096, + "Received: from %s (Citadel from userid %ld)\n" + " by %s; %s\n", + sSMTP->helo_node, + (long int) CC->cs_UDSclientUID, + config.c_fqdn, + nowstamp); + } + else { + snprintf(defbody, 4096, + "Received: from %s (%s [%s])\n" + " by %s; %s\n", + sSMTP->helo_node, + CC->cs_host, + CC->cs_addr, + config.c_fqdn, + nowstamp); + } + } + body = CtdlReadMessageBodyBuf(HKEY("."), config.c_maxmsglen, defbody, 1, NULL); if (body == NULL) { cprintf("550 Unable to save message: internal error.\r\n"); return; } - CtdlLogPrintf(CTDL_DEBUG, "Converting message...\n"); - msg = convert_internet_message(body); + syslog(LOG_DEBUG, "Converting message...\n"); + msg = convert_internet_message_buf(&body); /* If the user is locally authenticated, FORCE the From: header to * show up as the real sender. Yes, this violates the RFC standard, @@ -704,18 +725,18 @@ void smtp_data(void) { if (msg->cm_fields['P'] != NULL) { free(msg->cm_fields['P']); } - msg->cm_fields['P'] = strdup(SMTP->from); + msg->cm_fields['P'] = strdup(sSMTP->from); /* Set the "envelope to" address */ if (msg->cm_fields['V'] != NULL) { free(msg->cm_fields['V']); } - msg->cm_fields['V'] = strdup(SMTP->recipients); + msg->cm_fields['V'] = strdup(sSMTP->recipients); /* Submit the message into the Citadel system. */ - valid = validate_recipients(SMTP->recipients, + valid = validate_recipients(sSMTP->recipients, smtp_get_Recipients (), - (SMTP->is_lmtp)? POST_LMTP: + (sSMTP->is_lmtp)? POST_LMTP: (CC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL); @@ -723,7 +744,7 @@ void smtp_data(void) { * submission (such as virus checkers or spam filters), call them now * and give them an opportunity to reject the message. */ - if (SMTP->is_unfiltered) { + if (sSMTP->is_unfiltered) { scan_errors = 0; } else { @@ -740,7 +761,7 @@ void smtp_data(void) { } else { /* Ok, we'll accept this message. */ - msgnum = CtdlSubmitMsg(msg, valid, ""); + msgnum = CtdlSubmitMsg(msg, valid, "", 0); if (msgnum > 0L) { sprintf(result, "250 Message accepted.\r\n"); } @@ -755,8 +776,8 @@ void smtp_data(void) { * have different results, we can get away with just spitting out the * same message once for each recipient. */ - if (SMTP->is_lmtp) { - for (i=0; inumber_of_recipients; ++i) { + if (sSMTP->is_lmtp) { + for (i=0; inumber_of_recipients; ++i) { cprintf("%s", result); } } @@ -764,20 +785,18 @@ void smtp_data(void) { cprintf("%s", result); } - /* Write something to the syslog (which may or may not be where the + /* Write something to the syslog(which may or may not be where the * rest of the Citadel logs are going; some sysadmins want LOG_MAIL). */ - if (enable_syslog) { - syslog((LOG_MAIL | LOG_INFO), - "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s", - msgnum, - SMTP->from, - SMTP->number_of_recipients, - CC->cs_host, - CC->cs_addr, - result - ); - } + syslog((LOG_MAIL | LOG_INFO), + "%ld: from=<%s>, nrcpts=%d, relay=%s [%s], stat=%s", + msgnum, + sSMTP->from, + sSMTP->number_of_recipients, + CC->cs_host, + CC->cs_addr, + result + ); /* Clean up */ CtdlFreeMessage(msg); @@ -812,26 +831,31 @@ void smtp_starttls(void) */ void smtp_command_loop(void) { char cmdbuf[SIZ]; + citsmtp *sSMTP = SMTP; + + if (sSMTP == NULL) { + syslog(LOG_EMERG, "Session SMTP data is null. WTF? We will crash now.\n"); + } time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - CtdlLogPrintf(CTDL_CRIT, "Client disconnected: ending session.\n"); - CC->kill_me = 1; + syslog(LOG_CRIT, "Client disconnected: ending session.\n"); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } - CtdlLogPrintf(CTDL_INFO, "SMTP server: %s\n", cmdbuf); + syslog(LOG_INFO, "SMTP server: %s\n", cmdbuf); while (strlen(cmdbuf) < 5) strcat(cmdbuf, " "); - if (SMTP->command_state == smtp_user) { + if (sSMTP->command_state == smtp_user) { smtp_get_user(cmdbuf); } - else if (SMTP->command_state == smtp_password) { + else if (sSMTP->command_state == smtp_password) { smtp_get_pass(cmdbuf); } - else if (SMTP->command_state == smtp_plain) { + else if (sSMTP->command_state == smtp_plain) { smtp_try_plain(cmdbuf); } @@ -869,7 +893,7 @@ void smtp_command_loop(void) { else if (!strncasecmp(cmdbuf, "QUIT", 4)) { cprintf("221 Goodbye...\r\n"); - CC->kill_me = 1; + CC->kill_me = KILLME_CLIENT_LOGGED_OUT; return; } @@ -895,915 +919,6 @@ void smtp_command_loop(void) { -/*****************************************************************************/ -/* SMTP CLIENT (OUTBOUND PROCESSING) STUFF */ -/*****************************************************************************/ - - - -/* - * smtp_try() - * - * Called by smtp_do_procmsg() to attempt delivery to one SMTP host - * - */ -void smtp_try(const char *key, const char *addr, int *status, - char *dsn, size_t n, long msgnum) -{ - int sock = (-1); - char mxhosts[1024]; - int num_mxhosts; - int mx; - int i; - char user[1024], node[1024], name[1024]; - char buf[1024]; - char mailfrom[1024]; - char mx_user[256]; - char mx_pass[256]; - char mx_host[256]; - char mx_port[256]; - int lp, rp; - char *msgtext; - char *ptr; - size_t msg_size; - int scan_done; - char *nextline; - char *chunk_to_send; - char prev_char; - - - /* Parse out the host portion of the recipient address */ - process_rfc822_addr(addr, user, node, name); - - CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Attempting delivery to <%s> @ <%s> (%s)\n", - user, node, name); - - /* Load the message out of the database */ - CC->redirect_buffer = malloc(SIZ); - CC->redirect_len = 0; - CC->redirect_alloc = SIZ; - CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1, NULL); - msgtext = CC->redirect_buffer; - msg_size = CC->redirect_len; - CC->redirect_buffer = NULL; - CC->redirect_len = 0; - CC->redirect_alloc = 0; - - /* Extract something to send later in the 'MAIL From:' command */ - strcpy(mailfrom, ""); - scan_done = 0; - ptr = msgtext; - do { - if (ptr = memreadline(ptr, buf, sizeof buf), *ptr == 0) { - scan_done = 1; - } - if (!strncasecmp(buf, "From:", 5)) { - safestrncpy(mailfrom, &buf[5], sizeof mailfrom); - striplt(mailfrom); - for (i=0; mailfrom[i]; ++i) { - if (!isprint(mailfrom[i])) { - strcpy(&mailfrom[i], &mailfrom[i+1]); - i=0; - } - } - - /* Strip out parenthesized names */ - lp = (-1); - rp = (-1); - for (i=0; mailfrom[i]; ++i) { - if (mailfrom[i] == '(') lp = i; - if (mailfrom[i] == ')') rp = i; - } - if ((lp>0)&&(rp>lp)) { - strcpy(&mailfrom[lp-1], &mailfrom[rp+1]); - } - - /* Prefer brokketized names */ - lp = (-1); - rp = (-1); - for (i=0; mailfrom[i]; ++i) { - if (mailfrom[i] == '<') lp = i; - if (mailfrom[i] == '>') rp = i; - } - if ( (lp>=0) && (rp>lp) ) { - mailfrom[rp] = 0; - strcpy(mailfrom, &mailfrom[lp]); - } - - scan_done = 1; - } - } while (scan_done == 0); - if (IsEmptyStr(mailfrom)) strcpy(mailfrom, "someone@somewhere.org"); - stripallbut(mailfrom, '<', '>'); - - /* Figure out what mail exchanger host we have to connect to */ - num_mxhosts = getmx(mxhosts, node); - CtdlLogPrintf(CTDL_DEBUG, "Number of MX hosts for <%s> is %d\n", node, num_mxhosts); - if (num_mxhosts < 1) { - *status = 5; - snprintf(dsn, SIZ, "No MX hosts found for <%s>", node); - return; - } - - sock = (-1); - for (mx=0; (mx 1) { - strcpy (mx_user, buf); - endpart = strrchr(mx_user, '@'); - *endpart = '\0'; - strcpy (mx_host, endpart + 1); - endpart = strrchr(mx_user, ':'); - if (endpart != NULL) { - strcpy(mx_pass, endpart+1); - *endpart = '\0'; - } - } - else - strcpy (mx_host, buf); - endpart = strrchr(mx_host, ':'); - if (endpart != 0){ - *endpart = '\0'; - strcpy(mx_port, endpart + 1); - } - else { - strcpy(mx_port, "25"); - } - CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port); - sock = sock_connect(mx_host, mx_port, "tcp"); - snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno)); - if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n"); - if (sock < 0) { - if (errno > 0) { - snprintf(dsn, SIZ, "%s", strerror(errno)); - } - else { - snprintf(dsn, SIZ, "Unable to connect to %s : %s\n", mx_host, mx_port); - } - } - } - - if (sock < 0) { - *status = 4; /* dsn is already filled in */ - return; - } - - /* Process the SMTP greeting from the server */ - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP conversation"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* At this point we know we are talking to a real SMTP server */ - - /* Do a EHLO command. If it fails, try the HELO command. */ - snprintf(buf, sizeof buf, "EHLO %s\r\n", config.c_fqdn); - CtdlLogPrintf(CTDL_DEBUG, ">%s", buf); - sock_write(sock, buf, strlen(buf)); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP HELO"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '2') { - snprintf(buf, sizeof buf, "HELO %s\r\n", config.c_fqdn); - CtdlLogPrintf(CTDL_DEBUG, ">%s", buf); - sock_write(sock, buf, strlen(buf)); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP HELO"); - goto bail; - } - } - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* Do an AUTH command if necessary */ - if (!IsEmptyStr(mx_user)) { - char encoded[1024]; - sprintf(buf, "%s%c%s%c%s", mx_user, '\0', mx_user, '\0', mx_pass); - CtdlEncodeBase64(encoded, buf, strlen(mx_user) + strlen(mx_user) + strlen(mx_pass) + 2, 0); - snprintf(buf, sizeof buf, "AUTH PLAIN %s\r\n", encoded); - CtdlLogPrintf(CTDL_DEBUG, ">%s", buf); - sock_write(sock, buf, strlen(buf)); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP AUTH"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - } - - /* previous command succeeded, now try the MAIL From: command */ - snprintf(buf, sizeof buf, "MAIL From: <%s>\r\n", mailfrom); - CtdlLogPrintf(CTDL_DEBUG, ">%s", buf); - sock_write(sock, buf, strlen(buf)); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP MAIL"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* MAIL succeeded, now try the RCPT To: command */ - snprintf(buf, sizeof buf, "RCPT To: <%s@%s>\r\n", user, node); - CtdlLogPrintf(CTDL_DEBUG, ">%s", buf); - sock_write(sock, buf, strlen(buf)); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP RCPT"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* RCPT succeeded, now try the DATA command */ - CtdlLogPrintf(CTDL_DEBUG, ">DATA\n"); - sock_write(sock, "DATA\r\n", 6); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP DATA"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - if (buf[0] != '3') { - if (buf[0] == '4') { - *status = 3; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* If we reach this point, the server is expecting data */ - /** Need to parse each line of the message here since someone may have sent - * a message containing a single dot on a line of its own. In that case we - * need to escape it in accordance with RFC821. - * We could do this with the tokenizer functions but num_tokens returns an - * int and the message may contain more lines than that, also copying each - * line would be slow. - */ - nextline = msgtext; - while (*nextline) - { - chunk_to_send = nextline; - while (*nextline != '\n') - nextline++; - nextline++; - prev_char = *nextline; - *nextline = '\0'; - if (!strcmp(chunk_to_send, ".\r\n"); - sock_write(sock, "..\r\n", 4); - else - sock_write(sock, chunk_to_send, (size_t)(nextline-chunk_to_send)); - *nextline = prev_char; - } - - if (msgtext[msg_size-1] != 10) { - CtdlLogPrintf(CTDL_WARNING, "Possible problem: message did not " - "correctly terminate. (expecting 0x10, got 0x%02x)\n", - buf[msg_size-1]); - } - - sock_write(sock, ".\r\n", 3); - if (ml_sock_gets(sock, buf) < 0) { - *status = 4; - strcpy(dsn, "Connection broken during SMTP message transmit"); - goto bail; - } - CtdlLogPrintf(CTDL_DEBUG, "%s\n", buf); - if (buf[0] != '2') { - if (buf[0] == '4') { - *status = 4; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - else { - *status = 5; - safestrncpy(dsn, &buf[4], 1023); - goto bail; - } - } - - /* We did it! */ - safestrncpy(dsn, &buf[4], 1023); - *status = 2; - - CtdlLogPrintf(CTDL_DEBUG, ">QUIT\n"); - sock_write(sock, "QUIT\r\n", 6); - ml_sock_gets(sock, buf); - CtdlLogPrintf(CTDL_DEBUG, "<%s\n", buf); - CtdlLogPrintf(CTDL_INFO, "SMTP client: delivery to <%s> @ <%s> (%s) succeeded\n", - user, node, name); - -bail: free(msgtext); - sock_close(sock); - - /* Write something to the syslog (which may or may not be where the - * rest of the Citadel logs are going; some sysadmins want LOG_MAIL). - */ - if (enable_syslog) { - syslog((LOG_MAIL | LOG_INFO), - "%ld: to=<%s>, relay=%s, stat=%s", - msgnum, - addr, - mx_host, - dsn - ); - } - - return; -} - - - -/* - * smtp_do_bounce() is caled by smtp_do_procmsg() to scan a set of delivery - * instructions for "5" codes (permanent fatal errors) and produce/deliver - * a "bounce" message (delivery status notification). - */ -void smtp_do_bounce(char *instr) { - int i; - int lines; - int status; - char buf[1024]; - char key[1024]; - char addr[1024]; - char dsn[1024]; - char bounceto[1024]; - char boundary[64]; - int num_bounces = 0; - int bounce_this = 0; - long bounce_msgid = (-1); - time_t submitted = 0L; - struct CtdlMessage *bmsg = NULL; - int give_up = 0; - struct recptypes *valid; - int successful_bounce = 0; - static int seq = 0; - char *omsgtext; - size_t omsgsize; - long omsgid = (-1); - - CtdlLogPrintf(CTDL_DEBUG, "smtp_do_bounce() called\n"); - strcpy(bounceto, ""); - sprintf(boundary, "=_Citadel_Multipart_%s_%04x%04x", config.c_fqdn, getpid(), ++seq); - lines = num_tokens(instr, '\n'); - - /* See if it's time to give up on delivery of this message */ - for (i=0; i SMTP_GIVE_UP ) { - give_up = 1; - } - - /* Start building our bounce message */ - - bmsg = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); - if (bmsg == NULL) return; - memset(bmsg, 0, sizeof(struct CtdlMessage)); - - bmsg->cm_magic = CTDLMESSAGE_MAGIC; - bmsg->cm_anon_type = MES_NORMAL; - bmsg->cm_format_type = FMT_RFC822; - bmsg->cm_fields['A'] = strdup("Citadel"); - bmsg->cm_fields['O'] = strdup(MAILROOM); - bmsg->cm_fields['N'] = strdup(config.c_nodename); - bmsg->cm_fields['U'] = strdup("Delivery Status Notification (Failure)"); - bmsg->cm_fields['M'] = malloc(1024); - - strcpy(bmsg->cm_fields['M'], "Content-type: multipart/mixed; boundary=\""); - strcat(bmsg->cm_fields['M'], boundary); - strcat(bmsg->cm_fields['M'], "\"\r\n"); - strcat(bmsg->cm_fields['M'], "MIME-Version: 1.0\r\n"); - strcat(bmsg->cm_fields['M'], "X-Mailer: " CITADEL "\r\n"); - strcat(bmsg->cm_fields['M'], "\r\nThis is a multipart message in MIME format.\r\n\r\n"); - strcat(bmsg->cm_fields['M'], "--"); - strcat(bmsg->cm_fields['M'], boundary); - strcat(bmsg->cm_fields['M'], "\r\n"); - strcat(bmsg->cm_fields['M'], "Content-type: text/plain\r\n\r\n"); - - if (give_up) strcat(bmsg->cm_fields['M'], -"A message you sent could not be delivered to some or all of its recipients\n" -"due to prolonged unavailability of its destination(s).\n" -"Giving up on the following addresses:\n\n" -); - - else strcat(bmsg->cm_fields['M'], -"A message you sent could not be delivered to some or all of its recipients.\n" -"The following addresses were undeliverable:\n\n" -); - - /* - * Now go through the instructions checking for stuff. - */ - for (i=0; i addr=<%s> status=%d dsn=<%s>\n", - key, addr, status, dsn); - - if (!strcasecmp(key, "bounceto")) { - strcpy(bounceto, addr); - } - - if (!strcasecmp(key, "msgid")) { - omsgid = atol(addr); - } - - if (!strcasecmp(key, "remote")) { - if (status == 5) bounce_this = 1; - if (give_up) bounce_this = 1; - } - - if (bounce_this) { - ++num_bounces; - - if (bmsg->cm_fields['M'] == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR ... M field is null " - "(%s:%d)\n", __FILE__, __LINE__); - } - - bmsg->cm_fields['M'] = realloc(bmsg->cm_fields['M'], - strlen(bmsg->cm_fields['M']) + 1024 ); - strcat(bmsg->cm_fields['M'], addr); - strcat(bmsg->cm_fields['M'], ": "); - strcat(bmsg->cm_fields['M'], dsn); - strcat(bmsg->cm_fields['M'], "\r\n"); - - remove_token(instr, i, '\n'); - --i; - --lines; - } - } - - /* Attach the original message */ - if (omsgid >= 0) { - strcat(bmsg->cm_fields['M'], "--"); - strcat(bmsg->cm_fields['M'], boundary); - strcat(bmsg->cm_fields['M'], "\r\n"); - strcat(bmsg->cm_fields['M'], "Content-type: message/rfc822\r\n"); - strcat(bmsg->cm_fields['M'], "Content-Transfer-Encoding: 7bit\r\n"); - strcat(bmsg->cm_fields['M'], "Content-Disposition: inline\r\n"); - strcat(bmsg->cm_fields['M'], "\r\n"); - - CC->redirect_buffer = malloc(SIZ); - CC->redirect_len = 0; - CC->redirect_alloc = SIZ; - CtdlOutputMsg(omsgid, MT_RFC822, HEADERS_ALL, 0, 1, NULL); - omsgtext = CC->redirect_buffer; - omsgsize = CC->redirect_len; - CC->redirect_buffer = NULL; - CC->redirect_len = 0; - CC->redirect_alloc = 0; - bmsg->cm_fields['M'] = realloc(bmsg->cm_fields['M'], - (strlen(bmsg->cm_fields['M']) + omsgsize + 1024) ); - strcat(bmsg->cm_fields['M'], omsgtext); - free(omsgtext); - } - - /* Close the multipart MIME scope */ - strcat(bmsg->cm_fields['M'], "--"); - strcat(bmsg->cm_fields['M'], boundary); - strcat(bmsg->cm_fields['M'], "--\r\n"); - - /* Deliver the bounce if there's anything worth mentioning */ - CtdlLogPrintf(CTDL_DEBUG, "num_bounces = %d\n", num_bounces); - if (num_bounces > 0) { - - /* First try the user who sent the message */ - CtdlLogPrintf(CTDL_DEBUG, "bounce to user? <%s>\n", bounceto); - if (IsEmptyStr(bounceto)) { - CtdlLogPrintf(CTDL_ERR, "No bounce address specified\n"); - bounce_msgid = (-1L); - } - - /* Can we deliver the bounce to the original sender? */ - valid = validate_recipients(bounceto, smtp_get_Recipients (), 0); - if (valid != NULL) { - if (valid->num_error == 0) { - CtdlSubmitMsg(bmsg, valid, ""); - successful_bounce = 1; - } - } - - /* If not, post it in the Aide> room */ - if (successful_bounce == 0) { - CtdlSubmitMsg(bmsg, NULL, config.c_aideroom); - } - - /* Free up the memory we used */ - if (valid != NULL) { - free_recipients(valid); - } - } - - CtdlFreeMessage(bmsg); - CtdlLogPrintf(CTDL_DEBUG, "Done processing bounces\n"); -} - - -/* - * smtp_purge_completed_deliveries() is caled by smtp_do_procmsg() to scan a - * set of delivery instructions for completed deliveries and remove them. - * - * It returns the number of incomplete deliveries remaining. - */ -int smtp_purge_completed_deliveries(char *instr) { - int i; - int lines; - int status; - char buf[1024]; - char key[1024]; - char addr[1024]; - char dsn[1024]; - int completed; - int incomplete = 0; - - lines = num_tokens(instr, '\n'); - for (i=0; icm_fields['M']); - CtdlFreeMessage(msg); - - /* Strip out the headers amd any other non-instruction line */ - lines = num_tokens(instr, '\n'); - for (i=0; i SMTP_RETRY_MAX) { - retry = SMTP_RETRY_MAX; - } - remove_token(instr, i, '\n'); - } - if (!strcasecmp(key, "attempted")) { - attempted = extract_long(buf, 1); - if (attempted > last_attempted) - last_attempted = attempted; - } - } - - /* - * Postpone delivery if we've already tried recently. - */ - if (((time(NULL) - last_attempted) < retry) && (run_queue_now == 0)) { - CtdlLogPrintf(CTDL_DEBUG, "SMTP client: Retry time not yet reached.\n"); - free(instr); - return; - } - - - /* - * Bail out if there's no actual message associated with this - */ - if (text_msgid < 0L) { - CtdlLogPrintf(CTDL_ERR, "SMTP client: no 'msgid' directive found!\n"); - free(instr); - return; - } - - /* Plow through the instructions looking for 'remote' directives and - * a status of 0 (no delivery yet attempted) or 3/4 (transient errors - * were experienced and it's time to try again) - */ - lines = num_tokens(instr, '\n'); - for (i=0; i\n", addr); - smtp_try(key, addr, &status, dsn, sizeof dsn, text_msgid); - if (status != 2) { - if (results == NULL) { - results = malloc(1024); - memset(results, 0, 1024); - } - else { - results = realloc(results, strlen(results) + 1024); - } - snprintf(&results[strlen(results)], 1024, - "%s|%s|%d|%s\n", - key, addr, status, dsn); - } - } - } - - if (results != NULL) { - instr = realloc(instr, strlen(instr) + strlen(results) + 2); - strcat(instr, results); - free(results); - } - - - /* Generate 'bounce' messages */ - smtp_do_bounce(instr); - - /* Go through the delivery list, deleting completed deliveries */ - incomplete_deliveries_remaining = - smtp_purge_completed_deliveries(instr); - - - /* - * No delivery instructions remain, so delete both the instructions - * message and the message message. - */ - if (incomplete_deliveries_remaining <= 0) { - long delmsgs[2]; - delmsgs[0] = msgnum; - delmsgs[1] = text_msgid; - CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, delmsgs, 2, ""); - } - - /* - * Uncompleted delivery instructions remain, so delete the old - * instructions and replace with the updated ones. - */ - if (incomplete_deliveries_remaining > 0) { - CtdlDeleteMessages(SMTP_SPOOLOUT_ROOM, &msgnum, 1, ""); - msg = malloc(sizeof(struct CtdlMessage)); - memset(msg, 0, sizeof(struct CtdlMessage)); - msg->cm_magic = CTDLMESSAGE_MAGIC; - msg->cm_anon_type = MES_NORMAL; - msg->cm_format_type = FMT_RFC822; - msg->cm_fields['M'] = malloc(strlen(instr)+SIZ); - snprintf(msg->cm_fields['M'], - strlen(instr)+SIZ, - "Content-type: %s\n\n%s\n" - "attempted|%ld\n" - "retry|%ld\n", - SPOOLMIME, instr, (long)time(NULL), (long)retry ); - CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM); - CtdlFreeMessage(msg); - } - - free(instr); -} - - - -/* - * smtp_do_queue() - * - * Run through the queue sending out messages. - */ -void smtp_do_queue(void) { - static int doing_queue = 0; - - /* - * This is a simple concurrency check to make sure only one queue run - * is done at a time. We could do this with a mutex, but since we - * don't really require extremely fine granularity here, we'll do it - * with a static variable instead. - */ - if (doing_queue) return; - doing_queue = 1; - - /* - * Go ahead and run the queue - */ - CtdlLogPrintf(CTDL_INFO, "SMTP client: processing outbound queue\n"); - - if (getroom(&CC->room, SMTP_SPOOLOUT_ROOM) != 0) { - CtdlLogPrintf(CTDL_ERR, "Cannot find room <%s>\n", SMTP_SPOOLOUT_ROOM); - return; - } - CtdlForEachMessage(MSGS_ALL, 0L, NULL, - SPOOLMIME, NULL, smtp_do_procmsg, NULL); - - CtdlLogPrintf(CTDL_INFO, "SMTP client: queue run completed\n"); - run_queue_now = 0; - doing_queue = 0; -} - - - -/*****************************************************************************/ -/* SMTP UTILITY COMMANDS */ -/*****************************************************************************/ - -void cmd_smtp(char *argbuf) { - char cmd[64]; - char node[256]; - char buf[1024]; - int i; - int num_mxhosts; - - if (CtdlAccessCheck(ac_aide)) return; - - extract_token(cmd, argbuf, 0, '|', sizeof cmd); - - if (!strcasecmp(cmd, "mx")) { - extract_token(node, argbuf, 1, '|', sizeof node); - num_mxhosts = getmx(buf, node); - cprintf("%d %d MX hosts listed for %s\n", - LISTING_FOLLOWS, num_mxhosts, node); - for (i=0; inown rooms list for Aides. - */ - if (lgetroom(&qrbuf, SMTP_SPOOLOUT_ROOM) == 0) { - qrbuf.QRflags2 |= QR2_SYSTEM; - lputroom(&qrbuf); - } -} @@ -1820,7 +935,7 @@ void smtp_cleanup_function(void) { /* Don't do this stuff if this is not an SMTP session! */ if (CC->h_command_function != smtp_command_loop) return; - CtdlLogPrintf(CTDL_DEBUG, "Performing SMTP cleanup hook\n"); + syslog(LOG_DEBUG, "Performing SMTP cleanup hook\n"); free(SMTP); } @@ -1873,12 +988,9 @@ CTDL_MODULE_INIT(smtp) NULL, CitadelServiceSMTP_LMTP_UNF); - smtp_init_spoolout(); - CtdlRegisterSessionHook(smtp_do_queue, EVT_TIMER); CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP); - CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands"); } /* return our Subversion id for the Log */ - return "$Id$"; + return "smtp"; }