summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.h
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r--usr.sbin/smtpd/smtpd.h51
1 files changed, 10 insertions, 41 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index a490bc11098..67376c5ca23 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.26 2008/12/13 13:15:38 jacekm Exp $ */
+/* $OpenBSD: smtpd.h,v 1.27 2008/12/13 23:19:34 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -156,28 +156,16 @@ enum imsg_type {
IMSG_CONF_OPTION,
IMSG_CONF_END,
IMSG_CONF_RELOAD,
- IMSG_LKA_LOOKUP_MAIL,
- IMSG_LKA_LOOKUP_RCPT,
- IMSG_LKA_ALIAS_LOOKUP,
- IMSG_LKA_VUSER_LOOKUP,
- IMSG_LKA_ALIAS_RESULT,
- IMSG_LKA_VUSER_RESULT,
- IMSG_LKA_ALIAS_RESULT_ACK,
- IMSG_LKA_ALIAS_SCHEDULE,
- IMSG_LKA_ALIAS_END,
- IMSG_LKA_NO_ALIAS,
- IMSG_LKA_MX_LOOKUP,
- IMSG_LKA_FORWARD_LOOKUP,
- IMSG_LKA_HOSTNAME_LOOKUP,
+ IMSG_LKA_MAIL,
+ IMSG_LKA_RCPT,
+ IMSG_LKA_ALIAS,
+ IMSG_LKA_MX,
+ IMSG_LKA_FORWARD,
+ IMSG_LKA_HOST,
IMSG_MDA_MAILBOX_FILE,
IMSG_MDA_MESSAGE_FILE,
- IMSG_MDA_MAILBOX_FILE_ERROR,
- IMSG_MDA_MESSAGE_FILE_ERROR,
- IMSG_MFA_RPATH_SUBMIT,
- IMSG_MFA_RCPT_SUBMIT,
- IMSG_MFA_DATA_SUBMIT,
- IMSG_MFA_LOOKUP_MAIL,
- IMSG_MFA_LOOKUP_RCPT,
+ IMSG_MFA_RCPT,
+ IMSG_MFA_MAIL,
IMSG_QUEUE_CREATE_MESSAGE,
IMSG_QUEUE_SUBMIT_ENVELOPE,
@@ -185,33 +173,14 @@ enum imsg_type {
IMSG_QUEUE_COMMIT_MESSAGE,
IMSG_QUEUE_REMOVE_SUBMISSION,
- IMSG_QUEUE_CREATE_MESSAGE_FILE,
- IMSG_QUEUE_DELETE_MESSAGE_FILE,
- IMSG_QUEUE_MESSAGE_SUBMIT,
IMSG_QUEUE_MESSAGE_UPDATE,
- IMSG_QUEUE_MESSAGE_COMPLETE,
- IMSG_QUEUE_MESSAGE_ACK,
- IMSG_QUEUE_BATCH_COMPLETE,
- IMSG_QUEUE_BATCH_CLOSE,
IMSG_QUEUE_MESSAGE_FD,
IMSG_QUEUE_MESSAGE_FILE,
- IMSG_QUEUE_ACCEPTED_CLOSE,
- IMSG_QUEUE_RETRY_CLOSE,
- IMSG_QUEUE_REJECTED_CLOSE,
-
- IMSG_QUEUE_RECIPIENT_ACCEPTED,
- IMSG_QUEUE_RECIPIENT_UPDATED,
-
- IMSG_CREATE_BATCH,
+ IMSG_BATCH_CREATE,
IMSG_BATCH_APPEND,
IMSG_BATCH_CLOSE,
- IMSG_SMTP_MESSAGE_ID,
-
- IMSG_SMTP_MESSAGE_FILE,
- IMSG_SMTP_SUBMIT_ACK,
- IMSG_SMTP_HOSTNAME_ANSWER,
IMSG_PARENT_MAILBOX_OPEN,
IMSG_PARENT_MESSAGE_OPEN,
IMSG_PARENT_MAILBOX_RENAME,