From 4d519cfdbf57344aeaa3610a302bf4c654c058f6 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sat, 28 Mar 2020 23:37:47 +0100 Subject: Predefined channles: Fix handling of legacy configuration options Fix the handling of legacy "Key" and "MaxUsers" [Channel] settings: - Activate them before evaluating the "Modes" parameter, to allow the latter to override those legacy options. - Enforce setting the respective +k/+l mode(s) to support the legacy "Mode = kl" notation, which was valid but is an invalid MODE string: key and limit are missing! So set them manually when "k" or "l" are detected in the first MODE parameter. - Sort modes +kl alphabetically, adjust test suite accordingly. --- src/testsuite/server-login-test.e | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/testsuite/server-login-test.e') diff --git a/src/testsuite/server-login-test.e b/src/testsuite/server-login-test.e index b5226a7d..bdf95e09 100644 --- a/src/testsuite/server-login-test.e +++ b/src/testsuite/server-login-test.e @@ -45,7 +45,7 @@ expect { } expect { timeout { exit 1 } - ":ngircd.test.server CHANINFO #FullKeyed +Plk Secret 0 :" + ":ngircd.test.server CHANINFO #FullKeyed +Pkl Secret 0 :" } expect { timeout { exit 1 } -- cgit 1.4.1