diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-06 01:14:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-06 01:14:32 +0100 |
| commit | 0e71fac1d18b0de0e9203cb6b71c971d55c8c70c (patch) | |
| tree | e58db2bf464bf09301a9c02c27330c2dba6b926d /core/configmanager.lua | |
| parent | 2ca03f1a40ea0854e0dda798b82e31c558eed578 (diff) | |
| parent | 91d2b2518f3e3d047dc43f59db3f7025d29ab86c (diff) | |
| download | prosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.tar.gz prosody-0e71fac1d18b0de0e9203cb6b71c971d55c8c70c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/configmanager.lua')
| -rw-r--r-- | core/configmanager.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 16d4b8e2..5a544375 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -158,7 +158,8 @@ do function env.Component(name) name = nameprep(name); - if rawget(config_table, name) and rawget(config_table[name], "defined") and not rawget(config_table[name], "component_module") then + if rawget(config_table, name) and rawget(config_table[name], "defined") + and not rawget(config_table[name], "component_module") then error(format("Component %q clashes with previously defined Host %q, for services use a sub-domain like conference.%s", name, name, name), 0); end |