diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 16:46:58 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 16:46:58 +0000 |
| commit | 5ce13ffc2bf87de7cc3feb24446f3f4005d4ce78 (patch) | |
| tree | 3544dab79f8c17ec2e5abaa52467859c7454404d /usr.sbin/smtpd/smtpd.h | |
| parent | 66885d0d296e28f4db1b48b8af3a59f782660814 (diff) | |
- change all occurences of T_DAEMON_BATCH,MESSAGE to T_BOUNCE_BATCH/MESSAGE
- make sure T_BOUNCE_MESSAGE is no longer OR-ed to T_MDA/MTA_MESSAGE
- define F_MESSAGE_BOUNCE flag and make sure bounce sessions set it
- teach smtpctl show queue how to recognize a bounce message
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 0af1e79ebca..43d9a55495f 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.133 2009/08/06 14:27:41 gilles Exp $ */ +/* $OpenBSD: smtpd.h,v 1.134 2009/08/06 16:46:57 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -387,7 +387,7 @@ TAILQ_HEAD(aliaseslist, alias); enum message_type { T_MDA_MESSAGE = 0x1, T_MTA_MESSAGE = 0x2, - T_DAEMON_MESSAGE = 0x4 + T_BOUNCE_MESSAGE = 0x4 }; enum message_status { @@ -407,7 +407,8 @@ enum message_flags { F_MESSAGE_PROCESSING = 0x4, F_MESSAGE_AUTHENTICATED = 0x8, F_MESSAGE_ENQUEUED = 0x10, - F_MESSAGE_FORCESCHEDULE = 0x20 + F_MESSAGE_FORCESCHEDULE = 0x20, + F_MESSAGE_BOUNCE = 0x40 }; struct message { @@ -451,7 +452,7 @@ enum batch_status { enum batch_type { T_MDA_BATCH = 0x1, T_MTA_BATCH = 0x2, - T_DAEMON_BATCH = 0x4 + T_BOUNCE_BATCH = 0x4 }; enum child_type { |