aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreric <eric@openbsd.org>2020-04-17 14:20:13 +0000
committereric <eric@openbsd.org>2020-04-17 14:20:13 +0000
commit6b0b8fd90755deda0824ca7cd43239578c735e97 (patch)
treea390b590f504f737a9d32e2b138d530898a27f41
parentWhen failing to validate a peer TLS certificate in the MTA due to the (diff)
downloadOpenSMTPD-6b0b8fd90755deda0824ca7cd43239578c735e97.tar.xz
OpenSMTPD-6b0b8fd90755deda0824ca7cd43239578c735e97.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@
-rw-r--r--lka_filter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lka_filter.c b/lka_filter.c
index 9141c39f..715ab831 100644
--- a/lka_filter.c
+++ b/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