summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjacekm <jacekm@openbsd.org>2009-11-13 11:37:27 +0000
committerjacekm <jacekm@openbsd.org>2009-11-13 11:37:27 +0000
commitfa47d2d43f2f37fb7bc32c9ba5203fa59079862c (patch)
treea2cad47374fc6d59eeb36af2dbec62a16067b51c
parentLog FQDN and IP of the server we handed mail to. As a bonus, don't delay (diff)
downloadwireguard-openbsd-fa47d2d43f2f37fb7bc32c9ba5203fa59079862c.tar.xz
wireguard-openbsd-fa47d2d43f2f37fb7bc32c9ba5203fa59079862c.zip
Include recipient address in "Recipient rejected" reply.
-rw-r--r--usr.sbin/smtpd/smtp_session.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index ae32db2413d..327015d5816 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.123 2009/11/05 23:30:01 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.124 2009/11/13 11:37:27 jacekm Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -655,7 +655,8 @@ session_pickup(struct session *s, struct submit_status *ss)
s->s_state = S_MAIL;
else
s->s_state = S_RCPT;
- session_respond(s, "%d Recipient rejected", ss->code);
+ session_respond(s, "%d Recipient rejected: %s@%s", ss->code,
+ s->s_msg.session_rcpt.user, s->s_msg.session_rcpt.domain);
return;
}