summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgilles <gilles@openbsd.org>2019-01-03 14:40:25 +0000
committergilles <gilles@openbsd.org>2019-01-03 14:40:25 +0000
commitf7b640443bf19df2a5f4b3e16b512ed3eeca510c (patch)
treea663cfeb002466618de264f48587fdd75a3d0b9f
parentFavor ENOTTY for unknown ioctl commands. (diff)
downloadwireguard-openbsd-f7b640443bf19df2a5f4b3e16b512ed3eeca510c.tar.xz
wireguard-openbsd-f7b640443bf19df2a5f4b3e16b512ed3eeca510c.zip
do not strip dot-escaping when sending to filters, dot-escape is removed on
return otherwise there are cases which can lead to a truncated mail. ok eric@
-rw-r--r--usr.sbin/smtpd/smtp_session.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index a8c0e13a46c..70ef681330b 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.383 2018/12/28 11:35:25 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.384 2019/01/03 14:40:25 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -2678,10 +2678,6 @@ smtp_tx_filtered_dataline(struct smtp_tx *tx, const char *line)
if (tx->error)
return 0;
- /* escape lines starting with a '.' */
- if (line[0] == '.')
- line += 1;
-
/* account for newline */
tx->datain += strlen(line) + 1;
if (tx->datain > env->sc_maxsize) {