diff options
| author | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-05-28 08:48:47 +0000 |
|---|---|---|
| committer | Jacek Masiulaniec <jacekm@cvs.openbsd.org> | 2009-05-28 08:48:47 +0000 |
| commit | 1414677fc0003cc7c4803bea3ebf12ff6d3744cd (patch) | |
| tree | d9b2e40eab1c510766d9d3e9236d619067b12031 | |
| parent | a846e4a95fd43bd87751e3481d2fe3a7f9a849f8 (diff) | |
Log the "for <foo@bar.com>" part in the Received field; ok gilles@
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index 0c9d272ffdd..ac6d6d552ee 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.100 2009/05/27 13:14:18 jacekm Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.101 2009/05/28 08:48:46 jacekm Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -659,12 +659,21 @@ session_pickup(struct session *s, struct submit_status *ss) s->s_state = S_DATACONTENT; session_respond(s, "354 Enter mail, end with \".\" on a line by" " itself"); + fprintf(s->datafp, "Received: from %s (%s [%s])\n", s->s_msg.session_helo, s->s_hostname, ss_to_text(&s->s_ss)); - fprintf(s->datafp, "\tby %s with %sSMTP id %s;\n", + fprintf(s->datafp, "\tby %s (OpenSMTPD) with %sSMTP id %s", s->s_env->sc_hostname, s->s_flags & F_EHLO ? "E" : "", s->s_msg.message_id); - fprintf(s->datafp, "\t%s\n", time_to_text(time(NULL))); + + if (s->rcptcount == 1) + fprintf(s->datafp, "\n\tfor <%s@%s>; ", + s->s_msg.session_rcpt.user, + s->s_msg.session_rcpt.domain); + else + fprintf(s->datafp, ";\n\t"); + + fprintf(s->datafp, "%s\n", time_to_text(time(NULL))); break; case S_DONE: |