diff options
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
| -rw-r--r-- | usr.sbin/smtpd/smtpd.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index 96e99cba981..390bf7b88c5 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.367 2012/09/25 17:38:55 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.368 2012/09/26 19:52:20 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -343,16 +343,10 @@ enum delivery_flags { DF_INTERNAL = 0x8 /* internal expansion forward */ }; -union delivery_data { - char user[MAXLOGNAME]; - char buffer[MAX_RULEBUFFER_LEN]; - struct mailaddr mailaddr; -}; - struct delivery_mda { enum action_type method; - union delivery_data to; - char as_user[MAXLOGNAME]; + char user[MAXLOGNAME]; + char buffer[MAX_RULEBUFFER_LEN]; }; struct delivery_mta { @@ -373,7 +367,11 @@ struct expandnode { int done; enum expand_type type; char as_user[MAXLOGNAME]; - union delivery_data u; + union { + char user[MAXLOGNAME]; + char buffer[MAX_RULEBUFFER_LEN]; + struct mailaddr mailaddr; + } u; }; struct expand { |