diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-09-10 23:17:06 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-09-10 23:17:06 +0100 |
| commit | c1fdd165bed28e7914d406938c278d811ef2bd65 (patch) | |
| tree | 6bfc6f9e4c7f37e2bdc3f7dc065baf6eca197257 | |
| parent | 2ea9714c6f63b8d5d0b74c14f47eab55b8b5957d (diff) | |
| parent | d617081ac45113fdaa8fc0604bee29a08d4aefed (diff) | |
| download | prosody-c1fdd165bed28e7914d406938c278d811ef2bd65.tar.gz prosody-c1fdd165bed28e7914d406938c278d811ef2bd65.zip | |
Merge 0.9->trunk
| -rw-r--r-- | core/storagemanager.lua | 8 | ||||
| -rw-r--r-- | plugins/mod_dialback.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_s2s/s2sout.lib.lua | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/storagemanager.lua b/core/storagemanager.lua index 3379cc0c..1b76a394 100644 --- a/core/storagemanager.lua +++ b/core/storagemanager.lua @@ -78,8 +78,8 @@ function get_driver(host, store) driver = null_storage_driver; end return driver, driver_name; - end - +end + function open(host, store, typ) local driver, driver_name = get_driver(host, store); local ret, err = driver:open(store, typ); @@ -101,10 +101,10 @@ function datamanager.store(username, host, datastore, data) return open(host, datastore):set(username, data); end function datamanager.list_stores(username, host) - return get_driver(host):list_stores(username, host); + return get_driver(host):list_stores(username); end function datamanager.purge(username, host) - return get_driver(host):purge(username, host); + return get_driver(host):purge(username); end return _M; diff --git a/plugins/mod_dialback.lua b/plugins/mod_dialback.lua index 69616a57..b2f84603 100644 --- a/plugins/mod_dialback.lua +++ b/plugins/mod_dialback.lua @@ -117,7 +117,7 @@ module:hook("stanza/jabber:server:dialback:verify", function(event) log("warn", "authoritative server for %s denied the key", attr.from or "(unknown)"); valid = "invalid"; end - if not dialback_verifying.sends2s then + if dialback_verifying.destroyed then log("warn", "Incoming s2s session %s was closed in the meantime, so we can't notify it of the db result", tostring(dialback_verifying):match("%w+$")); else dialback_verifying.sends2s( diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua index 17978b39..07623968 100644 --- a/plugins/mod_s2s/s2sout.lib.lua +++ b/plugins/mod_s2s/s2sout.lib.lua @@ -94,7 +94,7 @@ function s2sout.attempt_connection(host_session, err) handle = adns.lookup(function (answer) handle = nil; host_session.connecting = nil; - if answer then + if answer and #answer > 0 then log("debug", "%s has SRV records, handling...", to_host); local srv_hosts = {}; host_session.srv_hosts = srv_hosts; |