diff options
| author |   Gilles Chehade <gilles@poolp.org> | 2019-10-13 16:26:29 +0200 |
|---|---|---|
| committer | Gilles Chehade <gilles@poolp.org> | 2019-10-13 16:26:29 +0200 |
| commit | 2c443d4218f04e2a12c9e78f854396dbf1c3a12c (patch) | |
| tree | b769a5134a2d1a0be7da4552fcb92c30de6a0fdb | |
| parent | Delete .travis.yml (diff) | |
| parent | sync (diff) | |
| download | OpenSMTPD-2c443d4218f04e2a12c9e78f854396dbf1c3a12c.tar.xz OpenSMTPD-2c443d4218f04e2a12c9e78f854396dbf1c3a12c.zip | |
Merge branch 'master' into portable
| -rw-r--r-- | smtpd/mda.c | 4 | ||||
| -rw-r--r-- | smtpd/smtp_session.c | 11 | ||||
| -rw-r--r-- | smtpd/spfwalk.c | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/smtpd/mda.c b/smtpd/mda.c index 8252f53b..5e8fec19 100644 --- a/smtpd/mda.c +++ b/smtpd/mda.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mda.c,v 1.140 2019/10/03 05:48:33 gilles Exp $ */ +/* $OpenBSD: mda.c,v 1.141 2019/10/03 08:50:08 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -249,8 +249,6 @@ mda_imsg(struct mproc *p, struct imsg *imsg) return; } - n = 0; - /* start queueing delivery headers */ if (e->sender[0]) /* diff --git a/smtpd/smtp_session.c b/smtpd/smtp_session.c index 10a9e598..d1e89468 100644 --- a/smtpd/smtp_session.c +++ b/smtpd/smtp_session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: smtp_session.c,v 1.414 2019/10/03 05:08:21 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.415 2019/10/04 08:34:29 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -1115,15 +1115,6 @@ smtp_io(struct io *io, int evt, void *arg) if (line == NULL) return; - if (strchr(line, '\r')) { - s->flags |= SF_BADINPUT; - smtp_reply(s, "500 %s <CR> is only allowed before <LF>", - esc_code(ESC_STATUS_PERMFAIL, ESC_OTHER_STATUS)); - smtp_enter_state(s, STATE_QUIT); - io_set_write(io); - return; - } - /* Message body */ eom = 0; if (s->state == STATE_BODY) { diff --git a/smtpd/spfwalk.c b/smtpd/spfwalk.c index 338d8f77..7299bbc2 100644 --- a/smtpd/spfwalk.c +++ b/smtpd/spfwalk.c @@ -82,9 +82,6 @@ spfwalk(int argc, struct parameter *argv) errx(1, "invalid ip_family"); } - argv += optind; - argc -= optind; - dict_init(&seen); event_init(); |