SMTP-Server: Assert with backtrace instead of running in a null pointer situation...

[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..0219659b936993ae87199b7a68cd4dbf8b74c9eb 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -20,21 +20,21 @@
  * 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
+ * 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
+ *  
+ *  
+ *  
  */
 
 #include "sysdep.h"
@@ -144,9 +144,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 +181,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;
 }
 
@@ -835,6 +831,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);
@@ -991,6 +988,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";
 }