From 3af9a6bc61031a67115630a14b00b7e3ba5f1152 Mon Sep 17 00:00:00 2001 From: Sunil Nimmagadda Date: Thu, 5 Nov 2015 09:14:32 +0000 Subject: Implement smtpctl uncorrupt "uncorrupt" moves envelopes from corrupt bucket back to the queue for further discovery by the daemon. After correcting the corrupt envelopes, admin could now... # smtpctl uncorrupt msgid # smtpctl discover msgid to schedule the messages. Ok gilles@ --- usr.sbin/smtpd/smtpd.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'usr.sbin/smtpd/smtpd.h') diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 42316a94846..35ec79af471 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.483 2015/10/29 10:25:36 sunil Exp $ */ +/* $OpenBSD: smtpd.h,v 1.484 2015/11/05 09:14:31 sunil Exp $ */ /* * Copyright (c) 2008 Gilles Chehade @@ -152,7 +152,7 @@ union lookup { * Bump IMSG_VERSION whenever a change is made to enum imsg_type. * This will ensure that we can never use a wrong version of smtpctl with smtpd. */ -#define IMSG_VERSION 13 +#define IMSG_VERSION 14 enum imsg_type { IMSG_NONE, @@ -193,6 +193,7 @@ enum imsg_type { IMSG_CTL_VERBOSE, IMSG_CTL_DISCOVER_EVPID, IMSG_CTL_DISCOVER_MSGID, + IMSG_CTL_UNCORRUPT_MSGID, IMSG_CTL_SMTP_SESSION, @@ -1302,6 +1303,7 @@ 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 *); -- cgit v1.2.3