summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/mda.c
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2014-04-30 09:17:30 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2014-04-30 09:17:30 +0000
commitb573f54c4ffcea197d3490e950792c7783e32dcb (patch)
tree175e362e64b69dfaa48c24f763cb6f81bcfa2da4 /usr.sbin/smtpd/mda.c
parent70b2df2db7914a7845e96808bc505ea0afe3d701 (diff)
when using maildir, do not create automatically create folders to match tag
in email address (ie: gilles+tag => ~/Maildir/.tag), instead use the folder if it already exists and deliver to the mail Maildir otherwise. ok eric@ and chl@
Diffstat (limited to 'usr.sbin/smtpd/mda.c')
-rw-r--r--usr.sbin/smtpd/mda.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 5dd4bdc1d07..0eecd8767f4 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.105 2014/04/19 17:42:18 gilles Exp $ */
+/* $OpenBSD: mda.c,v 1.106 2014/04/30 09:17:29 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -290,6 +290,8 @@ mda_imsg(struct mproc *p, struct imsg *imsg)
deliver.userinfo = *userinfo;
(void)strlcpy(deliver.user, userinfo->username,
sizeof(deliver.user));
+ (void)strlcpy(deliver.dest, e->dest,
+ sizeof(deliver.dest));
if (strlcpy(deliver.to, e->buffer,
sizeof(deliver.to))
>= sizeof(deliver.to)) {