summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunil <sunil@openbsd.org>2018-04-23 10:27:24 +0000
committersunil <sunil@openbsd.org>2018-04-23 10:27:24 +0000
commit640f55f54cbe9f0bd53fc958f3afc64ff6ffb9e7 (patch)
treeba58d6033e8e85b963631c2ea5ebcbb8b42d1df2
parentMake whitespace between functions and structs a bit more consistent. (diff)
downloadwireguard-openbsd-640f55f54cbe9f0bd53fc958f3afc64ff6ffb9e7.tar.xz
wireguard-openbsd-640f55f54cbe9f0bd53fc958f3afc64ff6ffb9e7.zip
Allow escaping quote within quotes.
Leah Neukirchen reports that according to RFC5322 escaping quote within quotes is valid and that postfix accepts it as well. https://github.com/OpenSMTPD/OpenSMTPD/issues/846 Ok gilles@
-rw-r--r--usr.sbin/smtpd/enqueue.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/enqueue.c b/usr.sbin/smtpd/enqueue.c
index 3fd7fbd6efe..a02d21ad245 100644
--- a/usr.sbin/smtpd/enqueue.c
+++ b/usr.sbin/smtpd/enqueue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: enqueue.c,v 1.113 2016/07/03 14:30:33 gilles Exp $ */
+/* $OpenBSD: enqueue.c,v 1.114 2018/04/23 10:27:24 sunil Exp $ */
/*
* Copyright (c) 2005 Henning Brauer <henning@bulabula.org>
@@ -716,8 +716,7 @@ parse_addr(char *s, size_t len, int is_from)
if (!pstate.quote && pstate.comment && s[pos] == ')')
pstate.comment--;
- if (!pstate.esc && !pstate.comment && !pstate.quote &&
- s[pos] == '\\')
+ if (!pstate.esc && !pstate.comment && s[pos] == '\\')
pstate.esc = 1;
else
pstate.esc = 0;