diff options
| author |   gilles <gilles@openbsd.org> | 2019-09-19 07:35:36 +0000 |
|---|---|---|
| committer | gilles <gilles@openbsd.org> | 2019-09-19 07:35:36 +0000 |
| commit | dd7527c8970536fb63d61722b9cefb568892dd6a (patch) | |
| tree | dd42676606860ec6837529a41c469b03375699ae | |
| parent | Don't attempt to join/expand nonexistent channels. (diff) | |
| download | wireguard-openbsd-dd7527c8970536fb63d61722b9cefb568892dd6a.tar.xz wireguard-openbsd-dd7527c8970536fb63d61722b9cefb568892dd6a.zip | |
unescape / and ^ in the general delivery case, they only need to be for
maildir
ok eric@
| -rw-r--r-- | usr.sbin/smtpd/mda_variables.c | 4 | ||||
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/mda_variables.c b/usr.sbin/smtpd/mda_variables.c index 03052e21554..4558305ef21 100644 --- a/usr.sbin/smtpd/mda_variables.c +++ b/usr.sbin/smtpd/mda_variables.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda_variables.c,v 1.5 2018/12/06 12:32:11 gilles Exp $ */ +/* $OpenBSD: mda_variables.c,v 1.6 2019/09/19 07:35:36 gilles Exp $ */ /* * Copyright (c) 2011-2017 Gilles Chehade <gilles@poolp.org> @@ -235,7 +235,7 @@ mda_expand_token(char *dest, size_t len, const char *token, string += begoff; for (; i; i--) { - *dest = (replace && *string == '/') ? ':' : *string; + *dest = *string; dest++; string++; } diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 261c03008a1..e5a968e9a5e 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.637 2019/09/18 11:26:30 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.638 2019/09/19 07:35:36 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -69,7 +69,7 @@ * potentially dangerous and need to be escaped. */ #define MAILADDR_ALLOWED "!#$%&'*/?^`{|}~+-=_" -#define MAILADDR_ESCAPE "!#$%&'*/?^`{|}~" +#define MAILADDR_ESCAPE "!#$%&'*?`{|}~" #define F_STARTTLS 0x01 |