Updated the comments in serv_smtp.c to reflect that it is strictly a server now.

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 885bf950f1193111294a3ddaa515868a2910fb93..d6f8e2a30e72ace82cfa10d1287a976d684a8a6a 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1,5 +1,5 @@
 /*
- * This module is an SMTP and ESMTP implementation for the Citadel system.
+ * This module is an SMTP and ESMTP server for the Citadel system.
  * It is compliant with all of the following:
  *
  * RFC  821 - Simple Mail Transfer Protocol
@@ -20,21 +20,15 @@
  * 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.
+ * Copyright (c) 1998-2012 by the citadel.org team
  *
+ *  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
  */
 
 #include "sysdep.h"
@@ -102,14 +96,6 @@ enum {                              /* Command states for login authentication */
 };
 
 
-
-
-
-/*****************************************************************************/
-/*                      SMTP SERVER (INBOUND) STUFF                          */
-/*****************************************************************************/
-
-
 /*
  * Here's where our SMTP session begins its happy day.
  */
@@ -144,9 +130,7 @@ void smtp_greeting(int is_msa)
        /* Otherwise we're either clean or we check later. */
 
        if (CC->nologin==1) {
-               cprintf("500 Too many users are already online (maximum is %d)\r\n",
-                       config.c_maxsessions
-               );
+               cprintf("451 Too many connections are already open; please try again later.\r\n");
                CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED;
                /* no need to free_recipients(valid), it's not allocated yet */
                return;
@@ -183,10 +167,8 @@ 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;
 }
 
@@ -594,11 +576,11 @@ void smtp_rcpt(char *argbuf) {
                }
        }
 
-       valid = validate_recipients(recp, 
-                                   smtp_get_Recipients (),
-                                   (sSMTP->is_lmtp)? POST_LMTP:
-                                      (CC->logged_in)? POST_LOGGED_IN:
-                                                       POST_EXTERNAL);
+       valid = validate_recipients(
+               recp, 
+               smtp_get_Recipients(),
+               (sSMTP->is_lmtp)? POST_LMTP: (CC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL
+       );
        if (valid->num_error != 0) {
                cprintf("550 %s\r\n", valid->errormsg);
                free_recipients(valid);
@@ -734,11 +716,11 @@ void smtp_data(void) {
        msg->cm_fields['V'] = strdup(sSMTP->recipients);
 
        /* Submit the message into the Citadel system. */
-       valid = validate_recipients(sSMTP->recipients, 
-                                   smtp_get_Recipients (),
-                                   (sSMTP->is_lmtp)? POST_LMTP:
-                                      (CC->logged_in)? POST_LOGGED_IN:
-                                                       POST_EXTERNAL);
+       valid = validate_recipients(
+               sSMTP->recipients,
+               smtp_get_Recipients(),
+               (sSMTP->is_lmtp)? POST_LMTP: (CC->logged_in)? POST_LOGGED_IN: POST_EXTERNAL
+       );
 
        /* If there are modules that want to scan this message before final
         * submission (such as virus checkers or spam filters), call them now
@@ -770,7 +752,7 @@ void smtp_data(void) {
                }
        }
 
-       /* For SMTP and ESTMP, just print the result message.  For LMTP, we
+       /* For SMTP and ESMTP, just print the result message.  For LMTP, we
         * have to print one result message for each recipient.  Since there
         * is nothing in Citadel which would cause different recipients to
         * have different results, we can get away with just spitting out the
@@ -806,7 +788,7 @@ void smtp_data(void) {
 
 
 /*
- * implements the STARTTLS command (Citadel API version)
+ * implements the STARTTLS command
  */
 void smtp_starttls(void)
 {
@@ -814,20 +796,16 @@ void smtp_starttls(void)
        char nosup_response[SIZ];
        char error_response[SIZ];
 
-       sprintf(ok_response,
-               "220 Begin TLS negotiation now\r\n");
-       sprintf(nosup_response,
-               "554 TLS not supported here\r\n");
-       sprintf(error_response,
-               "554 Internal error\r\n");
+       sprintf(ok_response, "220 Begin TLS negotiation now\r\n");
+       sprintf(nosup_response, "554 TLS not supported here\r\n");
+       sprintf(error_response, "554 Internal error\r\n");
        CtdlModuleStartCryptoMsgs(ok_response, nosup_response, error_response);
        smtp_rset(0);
 }
 
 
-
 /* 
- * Main command loop for SMTP sessions.
+ * Main command loop for SMTP server sessions.
  */
 void smtp_command_loop(void) {
        char cmdbuf[SIZ];
@@ -835,6 +813,7 @@ void smtp_command_loop(void) {
 
        if (sSMTP == NULL) {
                syslog(LOG_EMERG, "Session SMTP data is null.  WTF?  We will crash now.\n");
+               return cit_panic_backtrace (0);
        }
 
        time(&CC->lastcmd);
@@ -917,12 +896,6 @@ void smtp_command_loop(void) {
 }
 
 
-
-
-
-
-
-
 /*****************************************************************************/
 /*                      MODULE INITIALIZATION STUFF                          */
 /*****************************************************************************/
@@ -991,6 +964,6 @@ CTDL_MODULE_INIT(smtp)
                CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP);
        }
        
-       /* return our Subversion id for the Log */
+       /* return our module name for the log */
        return "smtp";
 }