From 04d57a1e7ccbcfb67d48903e6d812bb1816ea592 Mon Sep 17 00:00:00 2001
From: Gilles Chehade <gilles@poolp.org>
Date: Sun, 13 Oct 2019 16:25:42 +0200
Subject: sync

---
 smtpd/mda.c          |  4 +---
 smtpd/smtp_session.c | 11 +----------
 smtpd/spfwalk.c      |  3 ---
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/smtpd/mda.c b/smtpd/mda.c
index 6bcf4fa4..765acda9 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>
@@ -242,8 +242,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 95db9099..c6a6d52d 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>
@@ -1109,15 +1109,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 3987af61..b643552d 100644
--- a/smtpd/spfwalk.c
+++ b/smtpd/spfwalk.c
@@ -78,9 +78,6 @@ spfwalk(int argc, struct parameter *argv)
 			errx(1, "invalid ip_family");
 	}
 
-	argv += optind;
-	argc -= optind;
-
 	dict_init(&seen);
   	event_init();
 
-- 
cgit v1.2.3-59-g8ed1b