summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/mda.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2013-02-05 11:45:19 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2013-02-05 11:45:19 +0000
commita22b20a625872fe007578606468f19db80bf4e46 (patch)
treed187d315377cda3a38eacb26c6fb3ed65e94c047 /usr.sbin/smtpd/mda.c
parent7cd8ab6cfacbee8d6601302f1bda468a6acd83f0 (diff)
- handle getaddrinfo() error as LKA_TEMPFAIL
- handle getsockname() error in smtp_connected() - accept '/' as part of user-part, expand to ':' as done by qmail - fix wrong check in mda leading to bogus Return-Path header - fix aliases parsing when there's a white space between key and separator - some cosmethic cleanup
Diffstat (limited to 'usr.sbin/smtpd/mda.c')
-rw-r--r--usr.sbin/smtpd/mda.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 609dcee5730..c54c256ad8b 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.88 2013/02/05 10:53:57 nicm Exp $ */
+/* $OpenBSD: mda.c,v 1.89 2013/02/05 11:45:18 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -295,7 +295,7 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
}
/* start queueing delivery headers */
- if (e->sender)
+ if (e->sender[0])
/* XXX: remove exising Return-Path, if any */
n = iobuf_fqueue(&s->iobuf,
"Return-Path: %s\nDelivered-To: %s\n",