summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--usr.sbin/smtpd/mda.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.sbin/smtpd/mda.c b/usr.sbin/smtpd/mda.c
index 1d2a0b9580e..8dcaafbb314 100644
--- a/usr.sbin/smtpd/mda.c
+++ b/usr.sbin/smtpd/mda.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mda.c,v 1.73 2012/09/16 16:43:28 chl Exp $ */
+/* $OpenBSD: mda.c,v 1.74 2012/09/20 09:27:49 eric Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -429,7 +429,7 @@ mda_check_loop(FILE *fp, struct envelope *ep)
{
char *buf, *lbuf;
size_t len;
- struct mailaddr maddr, dest;
+ struct mailaddr maddr;
int ret = 0;
lbuf = NULL;
@@ -453,11 +453,8 @@ mda_check_loop(FILE *fp, struct envelope *ep)
bzero(&maddr, sizeof maddr);
if (! email_to_mailaddr(&maddr, buf + 14))
continue;
-
- dest = (ep->type == D_BOUNCE) ? ep->sender : ep->dest;
-
- if (strcasecmp(maddr.user, dest.user) == 0 &&
- strcasecmp(maddr.domain, dest.domain) == 0) {
+ if (strcasecmp(maddr.user, ep->dest.user) == 0 &&
+ strcasecmp(maddr.domain, ep->dest.domain) == 0) {
ret = 1;
break;
}