From 1f270c985f4664967e76755279fb58ae0763e8a8 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 11 Aug 2017 15:09:53 -0700 Subject: [PATCH] hybrid: drop EX and IE from required capabilities This fixes compatibility with hybrid trunk, commit ircd-hybrid/ircd-hybrid@981c61e36cf0f78d2a90bd2bcf4c86ae510d7cc4 (cherry picked from commit 30dc4a2b27d6b6e6d68b0d154fbafd737207596e) Conflicts: protocols/hybrid.py --- protocols/hybrid.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/protocols/hybrid.py b/protocols/hybrid.py index 6fa4903..2313307 100644 --- a/protocols/hybrid.py +++ b/protocols/hybrid.py @@ -35,6 +35,7 @@ class HybridProtocol(TS6Protocol): 'regmoderated': 'M', 'operonly': 'O', 'regonly': 'R', 'sslonly': 'S', 'banexception': 'e', 'noknock': 'p', 'registered': 'r', 'invex': 'I', 'paranoia': 'p', + 'banexception': 'e', # Now, map all the ABCD type modes: '*A': 'beI', '*B': 'k', '*C': 'l', '*D': 'cimnprstCMORS' } @@ -157,7 +158,7 @@ class HybridProtocol(TS6Protocol): # we know what modes it supports (indeed, this is a standard list). # <- CAPAB :UNDLN UNKLN KLN TBURST KNOCK ENCAP DLN IE EX HOPS CHW SVS CLUSTER EOB QS self.irc.caps = caps = args[0].split() - for required_cap in ('EX', 'IE', 'SVS', 'EOB', 'HOPS', 'QS', 'TBURST', 'SVS'): + for required_cap in ('SVS', 'EOB', 'HOPS', 'QS', 'TBURST'): if required_cap not in caps: raise ProtocolError('%s not found in TS6 capabilities list; this is required! (got %r)' % (required_cap, caps))