Mercurial > moin > 1.9
changeset 4338:302617f29787
Added support for authentication realms other then server hostname (by Tim Spriggs)
| author | Karol 'grzywacz' Nowak <grywacz@gmail.com> |
|---|---|
| date | Tue, 23 Sep 2008 00:53:52 +0200 |
| parents | 087eac1e1497 |
| children | 7bab85e4b1a4 |
| files | docs/CHANGES jabberbot/xmppbot.py |
| diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/CHANGES Sat Sep 13 10:33:26 2008 +0200 +++ b/docs/CHANGES Tue Sep 23 00:53:52 2008 +0200 @@ -30,6 +30,10 @@ having made a backup with some other, proven method. USE BOTH ON YOUR OWN RISK! +1.7.current: + Fixes: + * Jabber bot can now be configured to use an authentication realm which + is different from the server's hostname Version 1.7.2: Fixes:
--- a/jabberbot/xmppbot.py Sat Sep 13 10:33:26 2008 +0200 +++ b/jabberbot/xmppbot.py Tue Sep 23 00:53:52 2008 +0200 @@ -178,6 +178,11 @@ self.from_commands = from_commands self.to_commands = to_commands jid = u"%s@%s/%s" % (config.xmpp_node, config.xmpp_server, config.xmpp_resource) + if u"@" in config.xmpp_node: + jid = u"%s/%s" % (config.xmpp_node, config.xmpp_resource) + else: + jid = u"%s@%s/%s" % (config.xmpp_node, config.xmpp_server, config.xmpp_resource) + self.config = config self.log = logging.getLogger(__name__)