# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1347315426 -3600
# Node ID 4c2c04a49938b22c0a70d23c480323e7b269cf7e
# Parent  12fb961c8f272f9f2b127edac0477b0f5dc3b9a1# Parent  3393cab2dd6b1cee7e19bd4466cd6aa47e8e8cfb
Merge 0.9->trunk

diff -r 12fb961c8f27 -r 4c2c04a49938 core/storagemanager.lua
--- a/core/storagemanager.lua	Tue Aug 28 05:52:30 2012 +0500
+++ b/core/storagemanager.lua	Mon Sep 10 23:17:06 2012 +0100
@@ -78,8 +78,8 @@
 		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 @@
 	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 -r 12fb961c8f27 -r 4c2c04a49938 plugins/mod_dialback.lua
--- a/plugins/mod_dialback.lua	Tue Aug 28 05:52:30 2012 +0500
+++ b/plugins/mod_dialback.lua	Mon Sep 10 23:17:06 2012 +0100
@@ -117,7 +117,7 @@
 				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 -r 12fb961c8f27 -r 4c2c04a49938 plugins/mod_s2s/s2sout.lib.lua
--- a/plugins/mod_s2s/s2sout.lib.lua	Tue Aug 28 05:52:30 2012 +0500
+++ b/plugins/mod_s2s/s2sout.lib.lua	Mon Sep 10 23:17:06 2012 +0100
@@ -94,7 +94,7 @@
 		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;