summary refs log tree commit diff
path: root/src/testsuite
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2020-03-28 23:37:47 +0100
committerAlexander Barton <alex@barton.de>2020-03-29 00:45:59 +0100
commit4d519cfdbf57344aeaa3610a302bf4c654c058f6 (patch)
treef2bb3764bbaae7d08cd242fe1168b805c828522b /src/testsuite
parentfed22184c57be6959b1906138ce83f5476ec2efa (diff)
downloadngircd-4d519cfdbf57344aeaa3610a302bf4c654c058f6.tar.gz
ngircd-4d519cfdbf57344aeaa3610a302bf4c654c058f6.zip
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.
Diffstat (limited to 'src/testsuite')
-rw-r--r--src/testsuite/server-login-test.e2
1 files changed, 1 insertions, 1 deletions
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 }