From a23c7749739d5ee963f9fdf0f6b9e11d83f1b066 Mon Sep 17 00:00:00 2001 From: eric Date: Fri, 17 Apr 2020 14:20:13 +0000 Subject: [PATCH] switch email and result fields in mail-from/rcpt-to event reports and bump protocol version. discussed with jung@, martijn@ and Gilles. ok jung@ --- usr.sbin/smtpd/lka_filter.c | 8 ++++---- 1 file 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 @@ -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 -- 2.20.1