X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtp.c;h=15110cdd68f2296b5434fefaaffc1f97d21d2ac1;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=eeace012e618b2837f1c0097548f87bf43bcfea0;hpb=7f9d699a7f73ac27bcbde2075a8758744036fb98;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index eeace012e..15110cdd6 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -20,7 +20,7 @@
  * The VRFY and EXPN commands have been removed from this implementation
  * because nobody uses these commands anymore, except for spammers.
  *
- * Copyright (c) 1998-2020 by the citadel.org team
+ * Copyright (c) 1998-2021 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.
@@ -42,18 +42,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <ctype.h>
 #include <string.h>
@@ -129,11 +118,6 @@ void registerSmtpCMD(const char *First, long FLen,
 }
 
 
-void smtp_cleanup(void)
-{
-	DeleteHash(&SMTPCmds);
-}
-
 /*
  * Here's where our SMTP session begins its happy day.
  */
@@ -709,7 +693,7 @@ void smtp_rcpt(long offset, long flags)
 {
 	struct CitContext *CCC = CC;
 	char message_to_spammer[SIZ];
-	recptypes *valid = NULL;
+	struct recptypes *valid = NULL;
 	citsmtp *sSMTP = SMTP;
 
 	if (StrLength(sSMTP->from) == 0) {
@@ -808,7 +792,7 @@ void smtp_data(long offset, long flags)
 	struct CtdlMessage *msg = NULL;
 	long msgnum = (-1L);
 	char nowstamp[SIZ];
-	recptypes *valid;
+	struct recptypes *valid;
 	int scan_errors;
 	int i;
 	citsmtp *sSMTP = SMTP;
@@ -948,7 +932,7 @@ void smtp_data(long offset, long flags)
 	}
 	
 	else {			/* Ok, we'll accept this message. */
-		msgnum = CtdlSubmitMsg(msg, valid, "", 0);
+		msgnum = CtdlSubmitMsg(msg, valid, "");
 		if (msgnum > 0L) {
 			StrBufPrintf(sSMTP->OneRcpt, "250 Message accepted.\r\n");
 		}
@@ -1190,7 +1174,6 @@ CTDL_MODULE_INIT(smtp)
 					NULL,
 					CitadelServiceSMTP_LMTP_UNF);
 
-		CtdlRegisterCleanupHook(smtp_cleanup);
 		CtdlRegisterSessionHook(smtp_cleanup_function, EVT_STOP, PRIO_STOP + 250);
 	}