summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2009-11-05 12:08:42 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2009-11-05 12:08:42 +0000
commita2bec193380129f6f7d32837affcba8603408df9 (patch)
tree90cee3cc1dd79a35593e61b1e9e2338bb4eaaefd
parent84ca295f106e023c9398810636efed0104a4ef93 (diff)
Include a Date: header in bounce messages.
ok jacekm@ gilles@
-rw-r--r--usr.sbin/smtpd/bounce.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/bounce.c b/usr.sbin/smtpd/bounce.c
index 56f8d78d3da..9c6e1a10da0 100644
--- a/usr.sbin/smtpd/bounce.c
+++ b/usr.sbin/smtpd/bounce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bounce.c,v 1.10 2009/11/05 12:05:47 jsing Exp $ */
+/* $OpenBSD: bounce.c,v 1.11 2009/11/05 12:08:41 jsing Exp $ */
/*
* Copyright (c) 2009 Gilles Chehade <gilles@openbsd.org>
@@ -78,10 +78,12 @@ bounce_session(struct smtpd *env, int fd, struct message *messagep)
reason += 4;
/* create message header */
+ /* XXX - The Date: header should be added during SMTP pickup. */
if (client_data_printf(cc->sp,
"Subject: Delivery status notification\n"
"From: Mailer Daemon <MAILER-DAEMON@%s>\n"
"To: %s@%s\n"
+ "Date: %s\n"
"\n"
"Hi !\n"
"\n"
@@ -96,6 +98,7 @@ bounce_session(struct smtpd *env, int fd, struct message *messagep)
"\n",
env->sc_hostname,
messagep->sender.user, messagep->sender.domain,
+ time_to_text(time(NULL)),
messagep->recipient.user, messagep->recipient.domain,
reason) < 0)
goto fail;