diff options
| author |   eric <eric@openbsd.org> | 2020-04-17 14:20:13 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2020-04-17 14:20:13 +0000 |
| commit | a23c7749739d5ee963f9fdf0f6b9e11d83f1b066 (patch) | |
| tree | 3ddee876e1d88dfe311886d969c1bca45b32a053 /usr.sbin/smtpd | |
| parent | Make sure the cursor position is still on screen after we have trimmed (diff) | |
| download | wireguard-openbsd-a23c7749739d5ee963f9fdf0f6b9e11d83f1b066.tar.xz wireguard-openbsd-a23c7749739d5ee963f9fdf0f6b9e11d83f1b066.zip | |
switch email and result fields in mail-from/rcpt-to event reports
and bump protocol version.
discussed with jung@, martijn@ and Gilles.
ok jung@
Diffstat (limited to 'usr.sbin/smtpd')
| -rw-r--r-- | usr.sbin/smtpd/lka_filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c index 9141c39f040..715ab831db7 100644 --- a/usr.sbin/smtpd/lka_filter.c +++ b/usr.sbin/smtpd/lka_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lka_filter.c,v 1.60 2020/01/08 01:41:11 gilles Exp $ */ +/* $OpenBSD: lka_filter.c,v 1.61 2020/04/17 14:20:13 eric Exp $ */ /* * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org> @@ -35,7 +35,7 @@ #include "smtpd.h" #include "log.h" -#define PROTOCOL_VERSION "0.5" +#define PROTOCOL_VERSION "0.6" struct filter; struct filter_session; @@ -1526,7 +1526,7 @@ lka_report_smtp_tx_mail(const char *direction, struct timeval *tv, uint64_t reqi break; } report_smtp_broadcast(reqid, direction, tv, "tx-mail", "%08x|%s|%s\n", - msgid, address, result); + msgid, result, address); } void @@ -1546,7 +1546,7 @@ lka_report_smtp_tx_rcpt(const char *direction, struct timeval *tv, uint64_t reqi break; } report_smtp_broadcast(reqid, direction, tv, "tx-rcpt", "%08x|%s|%s\n", - msgid, address, result); + msgid, result, address); } void |