summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2009-10-25 21:06:07 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2009-10-25 21:06:07 +0000
commita9f0985ce71f7768c83b39c36b1ad103dbc112a7 (patch)
treee1fea4fc0cad15cfb3cbdc35f7326bbf7b1dce73 /usr.sbin
parenteee1381a781a0491b9f63b7bc25e0567af62bec7 (diff)
tag should also be copied from listener to message when the message is
enqueued through smtpctl
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/smtpd/smtp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index 0884f109f2f..e1f939f66e5 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.62 2009/09/18 00:04:26 jacekm Exp $ */
+/* $OpenBSD: smtp.c,v 1.63 2009/10/25 21:06:06 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -540,6 +540,7 @@ smtp_dispatch_control(int sig, short event, void *p)
s->s_env = env;
s->s_l = &l;
s->s_msg.flags |= F_MESSAGE_ENQUEUED;
+ (void)strlcpy(s->s_msg.tag, s->s_l->tag, sizeof(s->s_msg.tag));
bzero(&hints, sizeof(hints));
hints.ai_family = PF_UNSPEC;