cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a crash in deliver, from upstream via Brad

Browse Source
This commit is contained in:
sthen 2010-04-14 08:28:54 +00:00
parent 725df891d8
commit 68a1003ed1
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/dovecot/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.135 2010/04/03 00:21:14 sthen Exp $
# $OpenBSD: Makefile,v 1.136 2010/04/14 08:28:54 sthen Exp $
SHARED_ONLY= Yes
@ -11,7 +11,7 @@ V_SIEVE= 0.1.15
V_MANAGESIEVE= 0.11.11
PKGNAME= dovecot-${V_DOVECOT}
PKGNAME-server= dovecot-${V_DOVECOT}p2
PKGNAME-server= dovecot-${V_DOVECOT}p3
FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p0v0
FULLPKGPATH-sieve= ${PKGPATH},-sieve

22
mail/dovecot/patches/patch-src_deliver_mail-send_c Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_deliver_mail-send_c,v 1.1 2010/04/14 08:28:54 sthen Exp $
--- src/deliver/mail-send.c.orig Sat Apr 10 19:03:50 2010
+++ src/deliver/mail-send.c Sat Apr 10 19:05:09 2010
@@ -61,6 +61,9 @@ int mail_send_rejection(struct mail *mail, const char
size_t size;
int ret;
+ if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
+ orig_msgid = NULL;
+
if (mail_get_first_header(mail, "Auto-Submitted", &value) > 0 &&
strcasecmp(value, "no") != 0) {
i_info("msgid=%s: Auto-submitted message discarded: %s",
@@ -69,8 +72,6 @@ int mail_send_rejection(struct mail *mail, const char
return 0;
}
- if (mail_get_first_header(mail, "Message-ID", &orig_msgid) < 0)
- orig_msgid = NULL;
return_addr = deliver_get_return_address(mail);
if (return_addr == NULL) {
i_info("msgid=%s: Return-Path missing, rejection reason: %s",