Merge 0.10->trunk

diff --git a/prosodyctl b/prosodyctl
index 92606dd2537c82f353b032e954e63cea2f0b0869..1fff7eed5a4f0d228c6fe5bc4704f3dd780f7626 100755 (executable)
--- a/prosodyctl
+++ b/prosodyctl
@@ -1063,11 +1063,15 @@ function commands.check(arg)
                
                local v6_supported = not not socket.tcp6;
                
-               for host, host_options in enabled_hosts() do
+               for jid, host_options in enabled_hosts() do
                        local all_targets_ok, some_targets_ok = true, false;
+                       local node, host = jid_split(jid);
                        
                        local is_component = not not host_options.component_module;
-                       print("Checking DNS for "..(is_component and "component" or "host").." "..host.."...");
+                       print("Checking DNS for "..(is_component and "component" or "host").." "..jid.."...");
+                       if node then
+                               print("Only the domain part ("..host..") is used in DNS.")
+                       end
                        local target_hosts = set.new();
                        if not is_component then
                                local res = dns.lookup("_xmpp-client._tcp."..idna.to_ascii(host)..".", "SRV");

diff --git a/util/sql.lua b/util/sql.lua
index f64e8e10a141c4cc0a9583bfa0e6e0819e589a0f..657acb79d0dd72d0f431b2300e545f5f2b41d555 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -328,7 +328,7 @@ function engine:set_encoding() -- to UTF-8
                local ok, actual_charset = self:transaction(function ()
                        return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
                end);
-               local charset_ok;
+               local charset_ok = true;
                for row in actual_charset do
                        if row[2] ~= charset then
                                log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset);