diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-12-27 15:41:51 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2018-12-27 15:41:51 +0000 |
| commit | 0b980b1d7414c3c56906af376f3961531ce4c175 (patch) | |
| tree | d18006efe19412f96ebf5e972ee2c27679e8b41a /usr.sbin/smtpd/smtpd.h | |
| parent | 5ad1bbdbdc081ee2d9d820e8f4edafc1d05dbacc (diff) | |
extract subaddress from last resolved node, not from dest or rcpt address
which was incorrect and can lead to ambiguous cases, this will affect the
people who were using subaddresses within aliases themselves AND expected
deliveries to a maildir subdir of the recipient user.
ok eric@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 8ac0a6d8911..36a8d9fb015 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.611 2018/12/27 14:23:41 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.612 2018/12/27 15:41:50 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -442,6 +442,7 @@ struct expandnode { char buffer[EXPAND_BUFFER]; struct mailaddr mailaddr; } u; + char subaddress[SMTPD_SUBADDRESS_SIZE]; }; struct expand { @@ -491,6 +492,7 @@ struct envelope { struct mailaddr dest; char mda_user[SMTPD_VUSERNAME_SIZE]; + char mda_subaddress[SMTPD_SUBADDRESS_SIZE]; char mda_exec[LINE_MAX]; enum delivery_type type; @@ -650,6 +652,7 @@ struct deliver { struct mailaddr rcpt; struct mailaddr dest; + char mda_subaddress[SMTPD_SUBADDRESS_SIZE]; char mda_exec[LINE_MAX]; struct userinfo userinfo; |