summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Moerbeek <otto@cvs.openbsd.org>2016-06-17 18:56:52 +0000
committerOtto Moerbeek <otto@cvs.openbsd.org>2016-06-17 18:56:52 +0000
commit9c7f6513cfe9d4243941f692a425e6cb1c0348ff (patch)
tree0de22084c5893b735ca9908ed7c8397d416c5936
parentf00e110b2d32aece187d0f47163b1209373490a9 (diff)
Also add missing date or message-id when listening on the submit port
ok gilles@
-rw-r--r--usr.sbin/smtpd/smtp_session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 559cf408384..05425f4189f 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.275 2016/06/15 21:52:47 eric Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.276 2016/06/17 18:56:51 otto Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -675,7 +675,7 @@ smtp_session(struct listener *listener, int sock,
rfc2822_body_callback(&s->rfc2822_parser,
dataline_callback, s);
- if (hostname || listener->local) {
+ if (hostname || listener->local || listener->port == 587) {
rfc2822_missing_header_callback(&s->rfc2822_parser, "date",
header_missing_callback, s);
rfc2822_missing_header_callback(&s->rfc2822_parser, "message-id",