diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-05-29 19:32:35 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-05-29 19:32:35 +0000 |
| commit | d08ebf03100834521ef692559653d50ae727351a (patch) | |
| tree | e66e86009d971e6d981c0fd548e5811ebfd5898d /usr.sbin/smtpd/parse.y | |
| parent | 451799317965ad645261918a3e3797999fb8fb4e (diff) | |
simplify mail.maildir as well as the parse.y glue
ok eric@
Diffstat (limited to 'usr.sbin/smtpd/parse.y')
| -rw-r--r-- | usr.sbin/smtpd/parse.y | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/parse.y b/usr.sbin/smtpd/parse.y index dd46d9b4d3d..5e3670de864 100644 --- a/usr.sbin/smtpd/parse.y +++ b/usr.sbin/smtpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.202 2018/05/25 14:10:28 gilles Exp $ */ +/* $OpenBSD: parse.y,v 1.203 2018/05/29 19:32:34 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -355,16 +355,15 @@ MBOX { asprintf(&dispatcher->u.local.command, "/usr/libexec/mail.local -f %%{sender} %%{user.username}"); } dispatcher_local_options | MAILDIR { - asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir -p %%{user.directory}/Maildir -r %%{dest.user}"); + asprintf(&dispatcher->u.local.command, "/usr/libexec/mail.maildir"); } dispatcher_local_options | MAILDIR STRING { if (strncmp($2, "~/", 2) == 0) asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir -p %%{user.directory}/%s -r %%{dest.user}}", $2+2); + "/usr/libexec/mail.maildir \"%%{user.directory}/%s\"", $2+2); else asprintf(&dispatcher->u.local.command, - "/usr/libexec/mail.maildir -p %s -r %%{dest.user}}", $2); + "/usr/libexec/mail.maildir \"%s\"", $2); } dispatcher_local_options | MDA STRING { asprintf(&dispatcher->u.local.command, |