summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.h
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2009-03-22 22:53:48 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2009-03-22 22:53:48 +0000
commit408eaa73fb87b6d62df1628d1ac7be3bb079070a (patch)
treeb74698550aef98dc2a4a2d5dc101c6bf8f41d413 /usr.sbin/smtpd/smtpd.h
parentec190bbf9f695c6eea05e314791affc4944a59d7 (diff)
fix a bug in the resolution of forward files which would cause usernames
not to be taken into account if they had no ~/.forward file AND were the result of an alias expansion that expanded to more than one username. while at it, I spotted another bug where I would check T_MDA_MESSAGE on the flags field instead of the type field. the bug could cause two MDA message to end up in the same batch which is no longer valid.
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r--usr.sbin/smtpd/smtpd.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 40e6a030cea..d02d2daa98e 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.95 2009/03/19 20:27:49 jacekm Exp $ */
+/* $OpenBSD: smtpd.h,v 1.96 2009/03/22 22:53:47 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -717,6 +717,7 @@ struct message_recipient {
struct forward_req {
u_int64_t id;
+ u_int8_t status;
char pw_name[MAXLOGNAME];
};