aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-08-05 17:18:35 +0100
committerMatthew Wild <mwild1@gmail.com>2012-08-05 17:18:35 +0100
commit18fc86713ef365cb5d699bed2840dc7b8aef6995 (patch)
tree2bc3c28f6b3a561701f8e44d2b42add48edbb793 /core
parent537e1447c2d65576c2d8c37b1197c6ed897534a0 (diff)
downloadprosody-18fc86713ef365cb5d699bed2840dc7b8aef6995.tar.gz
prosody-18fc86713ef365cb5d699bed2840dc7b8aef6995.zip
hostmanager, mod_disco: Show optional 'name' option from the config in disco#items queries (fixes use-case in #292) (thanks diSabler, mva)
Diffstat (limited to 'core')
-rw-r--r--core/hostmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 66275d96..3c90dbb9 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -84,7 +84,7 @@ function activate(host, host_config)
end
hosts[host] = host_session;
if not host:match("[@/]") then
- disco_items:set(host:match("%.(.*)") or "*", host, true);
+ disco_items:set(host:match("%.(.*)") or "*", host, host_config.core.name or true);
end
for option_name in pairs(host_config.core) do
if option_name:match("_ports$") or option_name:match("_interface$") then