Fix network registration (SASL password should not be set up on registration).

This commit is contained in:
Valentin Lorentz 2011-12-03 12:36:16 +01:00
parent a98b2df392
commit 0caf7dba5b
2 changed files with 4 additions and 3 deletions

View File

@ -266,7 +266,8 @@ class SpaceSeparatedSetOfChannels(registry.SpaceSeparatedListOf):
else:
return ircmsgs.join(channel)
def registerNetwork(name, password='', ssl=False, sasl_username=''):
def registerNetwork(name, password='', ssl=False, sasl_username='',
sasl_password=''):
network = registerGroup(supybot.networks, name)
registerGlobalValue(network, 'password', registry.String(password,
_("""Determines what password will be used on %s. Yes, we know that
@ -293,7 +294,7 @@ def registerNetwork(name, password='', ssl=False, sasl_username=''):
_("""Determines what SASL username will be used on %s. This should
be the bot's account name. Due to the way SASL works, you can't use
any grouped nick.""") % name, private=False))
registerGlobalValue(sasl, 'password', registry.String(password,
registerGlobalValue(sasl, 'password', registry.String(sasl_password,
_("""Determines what SASL password will be used on %s.""") \
% name, private=True))
return network

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change
them once."""
version = '0.83.4.1+limnoria (2011-11-21T19:43:56+0100)'
version = '0.83.4.1+limnoria (2011-12-03T12:36:16+0100)'