X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fsmtp_util.c;h=3f57c2de0977fee629ca69ec40777ebbceea9bb2;hb=882ff5a53c3b4e440520a073cf07dc60b2671876;hp=4a4ac365bc639a63f2bf0f8abfc95a53d9886051;hpb=da0b049809b9ad1459a4ac0467e79bfb5c5d2719;p=citadel.git

diff --git a/citadel/modules/smtp/smtp_util.c b/citadel/modules/smtp/smtp_util.c
index 4a4ac365b..3f57c2de0 100644
--- a/citadel/modules/smtp/smtp_util.c
+++ b/citadel/modules/smtp/smtp_util.c
@@ -1,7 +1,7 @@
 /*
  * Utility functions for the Citadel SMTP implementation
  *
- * Copyright (c) 1998-2017 by the citadel.org team
+ * Copyright (c) 1998-2020 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.
@@ -23,18 +23,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>
@@ -95,7 +84,7 @@ void smtp_do_bounce(const char *instr, int is_final)
 	int num_bounces = 0;
 	int bounce_this = 0;
 	struct CtdlMessage *bmsg = NULL;
-	recptypes *valid;
+	struct recptypes *valid;
 	int successful_bounce = 0;
 	static int seq = 0;
 	StrBuf *BounceMB;
@@ -120,7 +109,6 @@ void smtp_do_bounce(const char *instr, int is_final)
 	bmsg->cm_format_type = FMT_RFC822;
 	CM_SetField(bmsg, eAuthor, HKEY("Citadel"));
 	CM_SetField(bmsg, eOriginalRoom, HKEY(MAILROOM));
-	CM_SetField(bmsg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
 	CM_SetField(bmsg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
 	StrBufAppendBufPlain(BounceMB, HKEY("Content-type: multipart/mixed; boundary=\""), 0);
 	StrBufAppendBuf(BounceMB, boundary, 0);
@@ -248,14 +236,14 @@ void smtp_do_bounce(const char *instr, int is_final)
 		valid = validate_recipients(bounceto, smtp_get_Recipients (), 0);
 		if (valid != NULL) {
 			if (valid->num_error == 0) {
-				CtdlSubmitMsg(bmsg, valid, "", QP_EADDR);
+				CtdlSubmitMsg(bmsg, valid, "");
 				successful_bounce = 1;
 			}
 		}
 
 		/* If not, post it in the Aide> room */
 		if (successful_bounce == 0) {
-			CtdlSubmitMsg(bmsg, NULL, CtdlGetConfigStr("c_aideroom"), QP_EADDR);
+			CtdlSubmitMsg(bmsg, NULL, CtdlGetConfigStr("c_aideroom"));
 		}
 
 		/* Free up the memory we used */