swap link-auth filter arguments

Fields which can contain a '|' character are kept last to avoid
ambiguities so move result before username; link-auth was likely forgot
in r1.61 of lka_filter.c when the same treatment was applied to other
events.

Discovered after a report on -portable due to filter-rspamd crashing.

ok millert@

diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c
index bb5e8f4..c67b7ba 100644 (file)
--- a/usr.sbin/smtpd/lka_filter.c
+++ b/usr.sbin/smtpd/lka_filter.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: lka_filter.c,v 1.72 2023/06/21 17:59:24 op Exp $      */
+/*     $OpenBSD: lka_filter.c,v 1.73 2023/07/07 14:52:00 op Exp $      */
 
 /*
  * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org>
@@ -24,7 +24,7 @@
 #include "smtpd.h"
 #include "log.h"
 
-#define        PROTOCOL_VERSION        "0.6"
+#define        PROTOCOL_VERSION        "0.7"
 
 struct filter;
 struct filter_session;
@@ -1444,7 +1444,7 @@ lka_report_smtp_link_auth(const char *direction, struct timeval *tv, uint64_t re
                fs->username = xstrdup(username);
        }
        report_smtp_broadcast(reqid, direction, tv, "link-auth", "%s|%s\n",
-           username, result);
+           result, username);
 }
 
 void

diff --git a/usr.sbin/smtpd/smtpd-filters.7 b/usr.sbin/smtpd/smtpd-filters.7
index 313404c..e8affac 100644 (file)
--- a/usr.sbin/smtpd/smtpd-filters.7
+++ b/usr.sbin/smtpd/smtpd-filters.7
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: smtpd-filters.7,v 1.9 2022/03/31 17:27:31 naddy Exp $
+.\"    $OpenBSD: smtpd-filters.7,v 1.10 2023/07/07 14:52:00 op Exp $
 .\"
 .\" Copyright (c) 2008 Janne Johansson <jj@openbsd.org>
 .\" Copyright (c) 2009 Jacek Masiulaniec <jacekm@dobremiasto.net>
@@ -17,7 +17,7 @@
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: July 7 2023 $
 .Dt SMTPD-FILTERS 7
 .Os
 .Sh NAME
@@ -271,12 +271,9 @@ contains a colon-separated list of TLS properties including the TLS version,
 the cipher suite used by the session and the cipher strength in bits.
 .It Ic link-disconnect
 This event is generated upon disconnection of the client.
-.It Ic link-auth : Ar username result
+.It Ic link-auth : Ar result username
 This event is generated upon an authentication attempt by the client.
 .Pp
-.Ar username
-contains the username used for the authentication attempt.
-.Pp
 .Ar result
 contains the string
 .Dq pass ,
@@ -284,6 +281,9 @@ contains the string
 or
 .Dq error
 depending on the result of the authentication attempt.
+.Pp
+.Ar username
+contains the username used for the authentication attempt.
 .It Ic tx-reset : Op message-id
 This event is generated when a transaction is reset.
 .Pp