kill corrupt / uncorrupt queue mechanism as it has never been usable and it

will be made irrelevant when the new config comes up soon

ok eric@

12 files changed, 21 insertions, 228 deletions

diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index d3e5b693680..172dffbe840 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.121 2018/01/27 08:32:03 anton Exp $	*/
+/*	$OpenBSD: control.c,v 1.122 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -101,7 +101,6 @@ control_imsg(struct mproc *p, struct imsg *imsg)
 	case IMSG_CTL_LIST_ENVELOPES:
 	case IMSG_CTL_DISCOVER_EVPID:
 	case IMSG_CTL_DISCOVER_MSGID:
-	case IMSG_CTL_UNCORRUPT_MSGID:
 	case IMSG_CTL_MTA_SHOW_HOSTS:
 	case IMSG_CTL_MTA_SHOW_RELAYS:
 	case IMSG_CTL_MTA_SHOW_ROUTES:
@@ -751,7 +750,6 @@ control_dispatch_ext(struct mproc *p, struct imsg *imsg)
 		return;
 
 	case IMSG_CTL_DISCOVER_MSGID:
-	case IMSG_CTL_UNCORRUPT_MSGID:
 		if (c->euid)
 			goto badcred;
 
diff --git a/usr.sbin/smtpd/queue.c b/usr.sbin/smtpd/queue.c
index 7e9bd0ae218..60959aafa57 100644
--- a/usr.sbin/smtpd/queue.c
+++ b/usr.sbin/smtpd/queue.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.c,v 1.184 2017/11/21 12:20:34 eric Exp $	*/
+/*	$OpenBSD: queue.c,v 1.185 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -524,15 +524,6 @@ queue_imsg(struct mproc *p, struct imsg *imsg)
 		tv.tv_usec = 10;
 		evtimer_add(&wi->ev, &tv);
 		return;
-
-	case IMSG_CTL_UNCORRUPT_MSGID:
-		m_msg(&m, imsg);
-		m_get_msgid(&m, &msgid);
-		m_end(&m);
-		ret = queue_message_uncorrupt(msgid);
-		m_compose(p_control, imsg->hdr.type, imsg->hdr.peerid,
-		    0, -1, &ret, sizeof ret);
-		return;
 	}
 
 	errx(1, "queue_imsg: unexpected %s imsg", imsg_to_str(imsg->hdr.type));
diff --git a/usr.sbin/smtpd/queue_backend.c b/usr.sbin/smtpd/queue_backend.c
index 3fef9508956..82d374bc232 100644
--- a/usr.sbin/smtpd/queue_backend.c
+++ b/usr.sbin/smtpd/queue_backend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_backend.c,v 1.62 2016/02/04 12:46:28 eric Exp $	*/
+/*	$OpenBSD: queue_backend.c,v 1.63 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -64,8 +64,6 @@ static int (*handler_message_create)(uint32_t *);
 static int (*handler_message_commit)(uint32_t, const char*);
 static int (*handler_message_delete)(uint32_t);
 static int (*handler_message_fd_r)(uint32_t);
-static int (*handler_message_corrupt)(uint32_t);
-static int (*handler_message_uncorrupt)(uint32_t);
 static int (*handler_envelope_create)(uint32_t, const char *, size_t, uint64_t *);
 static int (*handler_envelope_delete)(uint64_t);
 static int (*handler_envelope_update)(uint64_t, const char *, size_t);
@@ -297,27 +295,6 @@ err:
 }
 
 int
-queue_message_corrupt(uint32_t msgid)
-{
-	int	r;
-
-	profile_enter("queue_message_corrupt");
-	r = handler_message_corrupt(msgid);
-	profile_leave();
-
-	log_trace(TRACE_QUEUE,
-	    "queue-backend: queue_message_corrupt(%08"PRIx32") -> %d", msgid, r);
-
-	return (r);
-}
-
-int
-queue_message_uncorrupt(uint32_t msgid)
-{
-	return handler_message_uncorrupt(msgid);
-}
-
-int
 queue_message_fd_r(uint32_t msgid)
 {
 	int	fdin = -1, fdout = -1, fd = -1;
@@ -607,11 +584,9 @@ queue_envelope_load(uint64_t evpid, struct envelope *ep)
 			}
 			return (1);
 		}
-		log_debug("debug: invalid envelope %016" PRIx64 ": %s",
-		    ep->id, e);
+		log_warnx("warn: invalid envelope %016" PRIx64 ": %s",
+		    evpid, e);
 	}
-
-	(void)queue_message_corrupt(evpid_to_msgid(evpid));
 	return (0);
 }
 
@@ -672,11 +647,9 @@ queue_message_walk(struct envelope *ep, uint32_t msgid, int *done, void **data)
 			 */
 			return (1);
 		}
-		log_debug("debug: invalid envelope %016" PRIx64 ": %s",
-		    ep->id, e);
-		(void)queue_message_corrupt(evpid_to_msgid(evpid));
+		log_warnx("warn: invalid envelope %016" PRIx64 ": %s",
+		    evpid, e);
 	}
-
 	return (0);
 }
 
@@ -706,11 +679,9 @@ queue_envelope_walk(struct envelope *ep)
 				queue_envelope_cache_add(ep);
 			return (1);
 		}
-		log_debug("debug: invalid envelope %016" PRIx64 ": %s",
-		    ep->id, e);
-		(void)queue_message_corrupt(evpid_to_msgid(evpid));
+		log_warnx("warn: invalid envelope %016" PRIx64 ": %s",
+		    evpid, e);
 	}
-
 	return (0);
 }
 
@@ -794,18 +765,6 @@ queue_api_on_message_fd_r(int(*cb)(uint32_t))
 }
 
 void
-queue_api_on_message_corrupt(int(*cb)(uint32_t))
-{
-	handler_message_corrupt = cb;
-}
-
-void
-queue_api_on_message_uncorrupt(int(*cb)(uint32_t))
-{
-	handler_message_uncorrupt = cb;
-}
-
-void
 queue_api_on_envelope_create(int(*cb)(uint32_t, const char *, size_t, uint64_t *))
 {
 	handler_envelope_create = cb;
diff --git a/usr.sbin/smtpd/queue_fs.c b/usr.sbin/smtpd/queue_fs.c
index 516db0b7b86..8c4ec3b2492 100644
--- a/usr.sbin/smtpd/queue_fs.c
+++ b/usr.sbin/smtpd/queue_fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_fs.c,v 1.15 2017/10/10 05:03:52 guenther Exp $	*/
+/*	$OpenBSD: queue_fs.c,v 1.16 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2011 Gilles Chehade <gilles@poolp.org>
@@ -44,7 +44,6 @@
 #include "log.h"
 
 #define PATH_QUEUE		"/queue"
-#define PATH_CORRUPT		"/corrupt"
 #define PATH_INCOMING		"/incoming"
 #define PATH_EVPTMP		PATH_INCOMING "/envelope.tmp"
 #define PATH_MESSAGE		"/message"
@@ -63,7 +62,6 @@ static void	fsqueue_envelope_path(uint64_t, char *, size_t);
 static void	fsqueue_envelope_incoming_path(uint64_t, char *, size_t);
 static int	fsqueue_envelope_dump(char *, const char *, size_t, int, int);
 static void	fsqueue_message_path(uint32_t, char *, size_t);
-static void	fsqueue_message_corrupt_path(uint32_t, char *, size_t);
 static void	fsqueue_message_incoming_path(uint32_t, char *, size_t);
 static void    *fsqueue_qwalk_new(void);
 static int	fsqueue_qwalk(void *, uint64_t *);
@@ -207,82 +205,6 @@ queue_fs_message_delete(uint32_t msgid)
 }
 
 static int
-queue_fs_message_corrupt(uint32_t msgid)
-{
-	struct stat sb;
-	char rootdir[PATH_MAX];
-	char corruptdir[PATH_MAX];
-	char buf[64];
-	int  retry = 0;
-
-	fsqueue_message_path(msgid, rootdir, sizeof(rootdir));
-	fsqueue_message_corrupt_path(msgid, corruptdir,
-	    sizeof(corruptdir));
-
-again:
-	if (stat(corruptdir, &sb) != -1 || errno != ENOENT) {
-		fsqueue_message_corrupt_path(msgid, corruptdir,
-		    sizeof(corruptdir));
-		(void)snprintf(buf, sizeof (buf), ".%d", retry++);
-		(void)strlcat(corruptdir, buf, sizeof(corruptdir));
-		goto again;
-	}
-
-	if (rename(rootdir, corruptdir) == -1) {
-		log_warn("warn: queue-fs: rename");
-		return 0;
-	}
-
-	tree_pop(&evpcount, msgid);
-
-	return 1;
-}
-
-static int
-queue_fs_message_uncorrupt(uint32_t msgid)
-{
-	struct stat	sb;
-	char		bucketdir[PATH_MAX];
-	char		queuedir[PATH_MAX];
-	char		corruptdir[PATH_MAX];
-
-	fsqueue_message_corrupt_path(msgid, corruptdir, sizeof(corruptdir));
-	if (stat(corruptdir, &sb) == -1) {
-		log_warnx("warn: queue-fs: stat %s failed", corruptdir);
-		return (0);
-	}
-
-	fsqueue_message_path(msgid, queuedir, sizeof(queuedir));
-	if (stat(queuedir, &sb) == 0) {
-		log_warnx("warn: queue-fs: %s already exists", queuedir);
-		return (0);
-	}
-
-	if (!bsnprintf(bucketdir, sizeof bucketdir, "%s/%02x", PATH_QUEUE,
-	    (msgid & 0xff000000) >> 24)) {
-		log_warnx("warn: queue-fs: path too long");
-		return (0);
-	}
-
-	/* create the bucket */
-	if (mkdir(bucketdir, 0700) == -1) {
-		if (errno == ENOSPC)
-			return (0);
-		if (errno != EEXIST) {
-			log_warn("warn: queue-fs: mkdir");
-			return (0);
-		}
-	}
-
-	if (rename(corruptdir, queuedir) == -1) {
-		log_warn("warn: queue-fs: rename");
-		return (0);
-	}
-
-	return (1);
-}
-
-static int
 queue_fs_envelope_create(uint32_t msgid, const char *buf, size_t len,
     uint64_t *evpid)
 {
@@ -624,15 +546,6 @@ fsqueue_message_path(uint32_t msgid, char *buf, size_t len)
 }
 
 static void
-fsqueue_message_corrupt_path(uint32_t msgid, char *buf, size_t len)
-{
-	if (!bsnprintf(buf, len, "%s/%08x",
-		PATH_CORRUPT,
-		msgid))
-		fatalx("fsqueue_message_corrupt_path: path does not fit buffer");
-}
-
-static void
 fsqueue_message_incoming_path(uint32_t msgid, char *buf, size_t len)
 {
 	if (!bsnprintf(buf, len, "%s/%08x",
@@ -726,7 +639,7 @@ static int
 queue_fs_init(struct passwd *pw, int server, const char *conf)
 {
 	unsigned int	 n;
-	char		*paths[] = { PATH_QUEUE, PATH_CORRUPT, PATH_INCOMING };
+	char		*paths[] = { PATH_QUEUE, PATH_INCOMING };
 	char		 path[PATH_MAX];
 	int		 ret;
 
@@ -754,8 +667,6 @@ queue_fs_init(struct passwd *pw, int server, const char *conf)
 	queue_api_on_message_commit(queue_fs_message_commit);
 	queue_api_on_message_delete(queue_fs_message_delete);
 	queue_api_on_message_fd_r(queue_fs_message_fd_r);
-	queue_api_on_message_corrupt(queue_fs_message_corrupt);
-	queue_api_on_message_uncorrupt(queue_fs_message_uncorrupt);
 	queue_api_on_envelope_create(queue_fs_envelope_create);
 	queue_api_on_envelope_delete(queue_fs_envelope_delete);
 	queue_api_on_envelope_update(queue_fs_envelope_update);
diff --git a/usr.sbin/smtpd/queue_null.c b/usr.sbin/smtpd/queue_null.c
index 46a85ab0384..c555e41d478 100644
--- a/usr.sbin/smtpd/queue_null.c
+++ b/usr.sbin/smtpd/queue_null.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_null.c,v 1.6 2015/01/20 17:37:54 deraadt Exp $	*/
+/*	$OpenBSD: queue_null.c,v 1.7 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
@@ -67,12 +67,6 @@ queue_null_message_fd_r(uint32_t msgid)
 }
 
 static int
-queue_null_message_corrupt(uint32_t msgid)
-{
-	return (0);
-}
-
-static int
 queue_null_envelope_create(uint32_t msgid, const char *buf, size_t len,
     uint64_t *evpid)
 {
@@ -111,7 +105,6 @@ queue_null_init(struct passwd *pw, int server, const char *conf)
 	queue_api_on_message_commit(queue_null_message_commit);
 	queue_api_on_message_delete(queue_null_message_delete);
 	queue_api_on_message_fd_r(queue_null_message_fd_r);
-	queue_api_on_message_corrupt(queue_null_message_corrupt);
 	queue_api_on_envelope_create(queue_null_envelope_create);
 	queue_api_on_envelope_delete(queue_null_envelope_delete);
 	queue_api_on_envelope_update(queue_null_envelope_update);
diff --git a/usr.sbin/smtpd/queue_proc.c b/usr.sbin/smtpd/queue_proc.c
index 1a4c2859b63..2c4beb4cc77 100644
--- a/usr.sbin/smtpd/queue_proc.c
+++ b/usr.sbin/smtpd/queue_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_proc.c,v 1.6 2015/12/05 13:14:21 claudio Exp $	*/
+/*	$OpenBSD: queue_proc.c,v 1.7 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -117,7 +117,7 @@ queue_proc_close(void)
 {
 	int	r;
 
-	imsg_compose(&ibuf, PROC_QUEUE_MESSAGE_CORRUPT, 0, 0, -1, NULL, 0);
+	imsg_compose(&ibuf, PROC_QUEUE_CLOSE, 0, 0, -1, NULL, 0);
 
 	queue_proc_call();
 	queue_proc_read(&r, sizeof(r));
@@ -191,21 +191,6 @@ queue_proc_message_fd_r(uint32_t msgid)
 }
 
 static int
-queue_proc_message_corrupt(uint32_t msgid)
-{
-	int	r;
-
-	imsg_compose(&ibuf, PROC_QUEUE_MESSAGE_CORRUPT, 0, 0, -1, &msgid,
-	    sizeof(msgid));
-
-	queue_proc_call();
-	queue_proc_read(&r, sizeof(r));
-	queue_proc_end();
-
-	return (r);
-}
-
-static int
 queue_proc_envelope_create(uint32_t msgid, const char *buf, size_t len,
     uint64_t *evpid)
 {
@@ -334,7 +319,6 @@ queue_proc_init(struct passwd *pw, int server, const char *conf)
 	queue_api_on_message_commit(queue_proc_message_commit);
 	queue_api_on_message_delete(queue_proc_message_delete);
 	queue_api_on_message_fd_r(queue_proc_message_fd_r);
-	queue_api_on_message_corrupt(queue_proc_message_corrupt);
 	queue_api_on_envelope_create(queue_proc_envelope_create);
 	queue_api_on_envelope_delete(queue_proc_envelope_delete);
 	queue_api_on_envelope_update(queue_proc_envelope_update);
diff --git a/usr.sbin/smtpd/queue_ram.c b/usr.sbin/smtpd/queue_ram.c
index 196cf5fe83c..81689f7b7f0 100644
--- a/usr.sbin/smtpd/queue_ram.c
+++ b/usr.sbin/smtpd/queue_ram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue_ram.c,v 1.7 2015/01/20 17:37:54 deraadt Exp $	*/
+/*	$OpenBSD: queue_ram.c,v 1.8 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
@@ -202,12 +202,6 @@ queue_ram_message_fd_r(uint32_t msgid)
 }
 
 static int
-queue_ram_message_corrupt(uint32_t msgid)
-{
-	return (queue_ram_message_delete(msgid));
-}
-
-static int
 queue_ram_envelope_create(uint32_t msgid, const char *buf, size_t len,
     uint64_t *evpid)
 {
@@ -327,7 +321,6 @@ queue_ram_init(struct passwd *pw, int server, const char * conf)
 	queue_api_on_message_commit(queue_ram_message_commit);
 	queue_api_on_message_delete(queue_ram_message_delete);
 	queue_api_on_message_fd_r(queue_ram_message_fd_r);
-	queue_api_on_message_corrupt(queue_ram_message_corrupt);
 	queue_api_on_envelope_create(queue_ram_envelope_create);
 	queue_api_on_envelope_delete(queue_ram_envelope_delete);
 	queue_api_on_envelope_update(queue_ram_envelope_update);
diff --git a/usr.sbin/smtpd/smtpctl.8 b/usr.sbin/smtpd/smtpctl.8
index bb85b51f0a3..e6e2a14e9d5 100644
--- a/usr.sbin/smtpd/smtpctl.8
+++ b/usr.sbin/smtpd/smtpctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: smtpctl.8,v 1.62 2018/01/30 20:48:35 jmc Exp $
+.\" $OpenBSD: smtpctl.8,v 1.63 2018/05/14 15:23:05 gilles Exp $
 .\"
 .\" Copyright (c) 2006 Pierre-Yves Ritschard <pyr@openbsd.org>
 .\" Copyright (c) 2012 Gilles Chehade <gilles@poolp.org>
@@ -15,7 +15,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 30 2018 $
+.Dd $Mdocdate: May 14 2018 $
 .Dt SMTPCTL 8
 .Os
 .Sh NAME
@@ -282,8 +282,6 @@ mproc
 .It
 all
 .El
-.It Cm uncorrupt Ar message-id
-Move all envelopes with the given message ID from corrupt bucket back to queue.
 .It Cm unprofile Ar subsystem
 Disables real-time profiling of
 .Ar subsystem .
diff --git a/usr.sbin/smtpd/smtpctl.c b/usr.sbin/smtpd/smtpctl.c
index f5daba594cc..a59336705bc 100644
--- a/usr.sbin/smtpd/smtpctl.c
+++ b/usr.sbin/smtpd/smtpctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpctl.c,v 1.159 2018/04/26 20:57:59 eric Exp $	*/
+/*	$OpenBSD: smtpctl.c,v 1.160 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -1017,31 +1017,6 @@ do_discover(int argc, struct parameter *argv)
 }
 
 static int
-do_uncorrupt(int argc, struct parameter *argv)
-{
-	uint32_t msgid;
-	int	 ret;
-
-	if (ibuf == NULL && !srv_connect())
-		errx(1, "smtpd doesn't seem to be running");
-
-	msgid = argv[0].u.u_msgid;
-	srv_send(IMSG_CTL_UNCORRUPT_MSGID, &msgid, sizeof msgid);
-	srv_recv(IMSG_CTL_UNCORRUPT_MSGID);
-
-	if (rlen == 0) {
-		srv_end();
-		return (0);
-	} else {
-		srv_read(&ret, sizeof ret);
-		srv_end();
-	}
-
-	printf("command %s\n", ret ? "succeeded" : "failed");
-	return (0);
-}
-
-static int
 do_spf_walk(int argc, struct parameter *argv)
 {
 	droppriv();
@@ -1107,7 +1082,6 @@ main(int argc, char **argv)
 	cmd_install_priv("show stats",		do_show_stats);
 	cmd_install_priv("show status",		do_show_status);
 	cmd_install_priv("trace <str>",		do_trace);
-	cmd_install_priv("uncorrupt <msgid>",	do_uncorrupt);
 	cmd_install_priv("unprofile <str>",	do_unprofile);
 	cmd_install_priv("untrace <str>",	do_untrace);
 	cmd_install_priv("update table <str>",	do_update_table);
diff --git a/usr.sbin/smtpd/smtpd-api.h b/usr.sbin/smtpd/smtpd-api.h
index 18f61bcda66..14a57c5e8f5 100644
--- a/usr.sbin/smtpd/smtpd-api.h
+++ b/usr.sbin/smtpd/smtpd-api.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd-api.h,v 1.32 2017/09/08 16:51:22 eric Exp $	*/
+/*	$OpenBSD: smtpd-api.h,v 1.33 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2013 Eric Faurot <eric@openbsd.org>
@@ -49,8 +49,6 @@ enum {
 	PROC_QUEUE_MESSAGE_DELETE,
 	PROC_QUEUE_MESSAGE_COMMIT,
 	PROC_QUEUE_MESSAGE_FD_R,
-	PROC_QUEUE_MESSAGE_CORRUPT,
-	PROC_QUEUE_MESSAGE_UNCORRUPT,
 	PROC_QUEUE_ENVELOPE_CREATE,
 	PROC_QUEUE_ENVELOPE_DELETE,
 	PROC_QUEUE_ENVELOPE_LOAD,
@@ -272,8 +270,6 @@ void queue_api_on_message_create(int(*)(uint32_t *));
 void queue_api_on_message_commit(int(*)(uint32_t, const char*));
 void queue_api_on_message_delete(int(*)(uint32_t));
 void queue_api_on_message_fd_r(int(*)(uint32_t));
-void queue_api_on_message_corrupt(int(*)(uint32_t));
-void queue_api_on_message_uncorrupt(int(*)(uint32_t));
 void queue_api_on_envelope_create(int(*)(uint32_t, const char *, size_t, uint64_t *));
 void queue_api_on_envelope_delete(int(*)(uint64_t));
 void queue_api_on_envelope_update(int(*)(uint64_t, const char *, size_t));
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index 87253cef07f..b144c94e614 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.c,v 1.293 2018/04/26 20:57:59 eric Exp $	*/
+/*	$OpenBSD: smtpd.c,v 1.294 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1740,7 +1740,6 @@ imsg_to_str(int type)
 	CASE(IMSG_CTL_VERBOSE);
 	CASE(IMSG_CTL_DISCOVER_EVPID);
 	CASE(IMSG_CTL_DISCOVER_MSGID);
-	CASE(IMSG_CTL_UNCORRUPT_MSGID);
 
 	CASE(IMSG_CTL_SMTP_SESSION);
 
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 81225dda62d..10184c10cfa 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.539 2018/04/26 20:57:59 eric Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.540 2018/05/14 15:23:05 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -204,7 +204,6 @@ enum imsg_type {
 	IMSG_CTL_VERBOSE,
 	IMSG_CTL_DISCOVER_EVPID,
 	IMSG_CTL_DISCOVER_MSGID,
-	IMSG_CTL_UNCORRUPT_MSGID,
 
 	IMSG_CTL_SMTP_SESSION,
 
@@ -1325,8 +1324,6 @@ int queue_message_delete(uint32_t);
 int queue_message_commit(uint32_t);
 int queue_message_fd_r(uint32_t);
 int queue_message_fd_rw(uint32_t);
-int queue_message_corrupt(uint32_t);
-int queue_message_uncorrupt(uint32_t);
 int queue_envelope_create(struct envelope *);
 int queue_envelope_delete(uint64_t);
 int queue_envelope_load(uint64_t, struct envelope *);