From 2ca6420e1752a4066c5aaf2d38a7f7a55a52b655 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 17 Oct 2021 20:25:05 +0200 Subject: [PATCH] irc: do not display first parameter in numeric command when it is "*" --- src/plugins/irc/irc-protocol.c | 6 ++++-- tests/unit/plugins/irc/test-irc-protocol.cpp | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 43b06bd39..66c03405d 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3149,7 +3149,8 @@ IRC_PROTOCOL_CALLBACK(numeric) IRC_PROTOCOL_MIN_PARAMS(1); - arg_text = (irc_server_strcasecmp (server, server->nick, params[0]) == 0) ? + arg_text = ((irc_server_strcasecmp (server, server->nick, params[0]) == 0) + || (strcmp (params[0], "*") == 0)) ? 1 : 0; str_params = irc_protocol_string_params (params, arg_text, num_params - 1); @@ -6910,7 +6911,8 @@ IRC_PROTOCOL_CALLBACK(901) * Callback for the IRC commands "903" and "907" (SASL OK). * * Commands look like: - * 903 nick :SASL authentication successful + * 903 nick :Authentication successful + * 903 * :Authentication successful */ IRC_PROTOCOL_CALLBACK(sasl_end_ok) diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index 9daa1d110..1fbe5e88a 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -4065,6 +4065,9 @@ TEST(IrcProtocolWithServer, 903_907) CHECK_SRV("-- ok"); RECV(":server 903 alice :SASL authentication successful"); CHECK_SRV("-- SASL authentication successful"); + RECV(":server 903 * :SASL authentication successful"); + CHECK_SRV("-- SASL authentication successful"); + RECV(":server 907 alice ok"); CHECK_SRV("-- ok");