- Pet MDA part, add brackets around Return-Path as per RFC5322 §3.6.6.

Missing brackets lead to a panic when a malformed address line
is fed to dovecot-lda

Submitted by:	gahr
Reported by:	brnrd via dovecot ML
Obtained from:	725ba4fa2d
This commit is contained in:
Dima Panov 2018-04-26 00:53:01 +00:00
parent 7b82ef5da2
commit 200e5f9ce0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=468319
4 changed files with 24 additions and 2 deletions

View file

@ -4,7 +4,7 @@
PORTNAME= opensmtpd
PORTVERSION= 201606220754
DISTVERSIONSUFFIX= p1
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \

View file

@ -0,0 +1,11 @@
--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000
+++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000
@@ -274,7 +274,7 @@
* if any
*/
n = iobuf_fqueue(&s->iobuf,
- "Return-Path: %s\n"
+ "Return-Path: <%s>\n"
"Delivered-To: %s\n",
e->sender,
e->rcpt ? e->rcpt : e->dest);

View file

@ -4,7 +4,7 @@
PORTNAME= opensmtpd
PORTVERSION= 5.9.2p1
PORTEPOCH= 1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= mail
MASTER_SITES= http://www.opensmtpd.org/archives/ \
http://distfiles.pirateparty.in/ashish/

View file

@ -0,0 +1,11 @@
--- smtpd/mda.c.orig 2016-05-13 02:56:04.000000000 +1000
+++ smtpd/mda.c 2018-04-26 10:28:45.373358000 +1000
@@ -274,7 +274,7 @@
* if any
*/
n = iobuf_fqueue(&s->iobuf,
- "Return-Path: %s\n"
+ "Return-Path: <%s>\n"
"Delivered-To: %s\n",
e->sender,
e->rcpt ? e->rcpt : e->dest);