diff options
| author | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 17:09:14 +0000 |
|---|---|---|
| committer | Gilles Chehade <gilles@cvs.openbsd.org> | 2009-08-06 17:09:14 +0000 |
| commit | c310e5e68b1e350173c25801f0f208699370fcc2 (patch) | |
| tree | 2622f3ab1b57e435dccb764b2f7983a358a2052f | |
| parent | 5ce13ffc2bf87de7cc3feb24446f3f4005d4ce78 (diff) | |
in smtp_session, fix logging so that when we accepted an empty envelope for
the sender, we dont log 'from=<@>' but from=<> instead
| -rw-r--r-- | usr.sbin/smtpd/smtp_session.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c index f6524f197ee..51e91b0b845 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.109 2009/08/01 15:33:28 gilles Exp $ */ +/* $OpenBSD: smtp_session.c,v 1.110 2009/08/06 17:09:13 gilles Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org> @@ -687,10 +687,11 @@ session_pickup(struct session *s, struct submit_status *ss) case S_DONE: session_respond(s, "250 %s Message accepted for delivery", s->s_msg.message_id); - log_info("%s: from=<%s@%s>, size=%ld, nrcpts=%zd, proto=%s, " + log_info("%s: from=<%s%s%s>, size=%ld, nrcpts=%zd, proto=%s, " "relay=%s [%s]", s->s_msg.message_id, s->s_msg.sender.user, + s->s_msg.sender.user[0] == '\0' ? "" : "@", s->s_msg.sender.domain, s->s_datalen, s->rcptcount, |