From b8a254167c83777000537748e0af2095169ecbb1 Mon Sep 17 00:00:00 2001 From: James Lu Date: Wed, 12 Jul 2017 21:32:04 -0700 Subject: [PATCH] p10: rename the 'p10_ircd' option to 'ircd', for consistency with ts6 --- example-conf.yml | 3 ++- protocols/p10.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/example-conf.yml b/example-conf.yml index 60d31db..9e86ce5 100644 --- a/example-conf.yml +++ b/example-conf.yml @@ -318,7 +318,8 @@ servers: # With this key set to 'generic', neither of these host changing features are enabled # and a baseline RFC1459 mode set is used. This configuration is not officially supported. - p10_ircd: nefarious + # This option was previously named "p10_ircd" in PyLink 1.2, but that name is now deprecated. + ircd: nefarious # Determines whether account-based cloaks should be used (someone.users.yournet.org # format). This should match your IRCd configuration: diff --git a/protocols/p10.py b/protocols/p10.py index e4fc9c3..cd6c2b3 100644 --- a/protocols/p10.py +++ b/protocols/p10.py @@ -695,7 +695,7 @@ class P10Protocol(IRCS2SProtocol): """Updates the ident or host of any connected client.""" uobj = self.users[target] - ircd = self.serverdata.get('p10_ircd', 'nefarious').lower() + ircd = self.serverdata.get('ircd', self.serverdata.get('p10_ircd', 'nefarious')).lower() if self.is_internal_client(target): # Host changing via SETHOST is only supported on nefarious and snircd.