X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=b7ee16a693da15c0fa14789e12ba67b041226b0f;hb=e329db30593524cc2d8851a4500bac41f2340354;hp=62bbe941c8b4d3dbf1cf0d1f6a8f18c4a5028d59;hpb=a652f0438fb7047bd82591f3f619a21d6e85d2dd;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 62bbe941c..b7ee16a69 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -116,7 +116,9 @@ void registerSmtpCMD(const char *First, long FLen,
 	smtp_handler_hook *h;
 
 	if (FLen >= MaxSMTPCmdLen)
-		cit_panic_backtrace (0);
+	{
+		abort();
+	}
 
 	h = (smtp_handler_hook*) malloc(sizeof(smtp_handler_hook));
 	memset(h, 0, sizeof(smtp_handler_hook));
@@ -405,7 +407,7 @@ void smtp_get_user(long offset)
 
 	StrBufDecodeBase64(sSMTP->Cmd);
 
-	if (CtdlLoginExistingUser(NULL, ChrPtr(sSMTP->Cmd)) == login_ok) {
+	if (CtdlLoginExistingUser(ChrPtr(sSMTP->Cmd)) == login_ok) {
 		size_t len = CtdlEncodeBase64(buf, "Password:", 9, 0);
 
 		if (buf[len - 1] == '\n') {
@@ -490,10 +492,10 @@ void smtp_try_plain(long offset, long Flags)
 	sSMTP->command_state = smtp_command;
 
 	if (!IsEmptyStr(ident)) {
-		result = CtdlLoginExistingUser(user, ident);
+		result = CtdlLoginExistingUser(ident);
 	}
 	else {
-		result = CtdlLoginExistingUser(NULL, user);
+		result = CtdlLoginExistingUser(user);
 	}
 
 	if (result == login_ok) {
@@ -898,7 +900,6 @@ void smtp_data(long offset, long flags)
 			return;
 		}
 
-		CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
 		CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode")));
         	CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM));
 		if (sSMTP->preferred_sender_name != NULL)
@@ -1023,7 +1024,7 @@ void smtp_command_loop(void)
 
 	if (sSMTP == NULL) {
 		syslog(LOG_EMERG, "Session SMTP data is null.  WTF?  We will crash now.");
-		return cit_panic_backtrace (0);
+		abort();
 	}
 
 	time(&CCC->lastcmd);