summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchl <chl@openbsd.org>2011-08-28 22:20:27 +0000
committerchl <chl@openbsd.org>2011-08-28 22:20:27 +0000
commit69d9e0965c735c86697427d3799fd970ddc12708 (patch)
tree590b63726fd2ebb9bae57004eb8d3a580c833084
parentUse the correct terminology, replace the term "entry" with the term "attribute" where applicable. (diff)
downloadwireguard-openbsd-69d9e0965c735c86697427d3799fd970ddc12708.tar.xz
wireguard-openbsd-69d9e0965c735c86697427d3799fd970ddc12708.zip
Clear bounce envelope structure, to avoid wrong use when bounce_record_message() returns 0.
Initial report from me, tweak from gilles@ ok gilles@
-rw-r--r--usr.sbin/smtpd/queue_shared.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/queue_shared.c b/usr.sbin/smtpd/queue_shared.c
index b0bb2c6f8bc..bfa4e818b59 100644
--- a/usr.sbin/smtpd/queue_shared.c
+++ b/usr.sbin/smtpd/queue_shared.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: queue_shared.c,v 1.49 2011/05/16 21:05:52 gilles Exp $ */
+/* $OpenBSD: queue_shared.c,v 1.50 2011/08/28 22:20:27 chl Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -63,6 +63,8 @@ bounce_record_message(struct envelope *e, struct envelope *bounce)
{
u_int32_t msgid;
+ bzero(bounce, sizeof(*bounce));
+
if (e->delivery.type == D_BOUNCE) {
log_debug("mailer daemons loop detected !");
return 0;