summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2015-08-15 17:27:44 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2015-08-15 17:27:44 +0000
commite1dc0bff9f02d311cca65513b03ac7cf261de4ed (patch)
treef65514fb158dc03307a44c56a504c9e3cd7effa9
parent849fb5577461300c5e7b052253d491e9ae920dc0 (diff)
assume messages use 8bit bytes by default, not just when 8BITMIME extension
is used, this is what the world expects, this is what other MTA do.
-rw-r--r--usr.sbin/smtpd/smtp_session.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 5dd6a585add..474ec0db684 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.230 2015/05/15 07:34:45 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.231 2015/08/15 17:27:43 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1034,7 +1034,7 @@ smtp_io(struct io *io, int evt)
struct smtp_session *s = io->arg;
const char *sn;
char *line;
- size_t len, i;
+ size_t len;
X509 *x;
log_trace(TRACE_IO, "smtp: %p: %s %s", s, io_strevent(evt),
@@ -1120,11 +1120,6 @@ smtp_io(struct io *io, int evt)
len -= 1;
}
- if (!(s->flags & SF_8BITMIME))
- for (i = 0; i < len; ++i)
- if (line[i] & 0x80)
- line[i] = line[i] & 0x7f;
-
smtp_message_write(s, line);
goto nextline;
}