Merge with waqas

[prosody.git] / core / hostmanager.lua

diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 0dd2c9d879a40f18485fc139eaf50f76d85c02ba..ba363273f90c8ad3d1b1216017aab4a63fe11b0a 100644 (file)
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local hosts = hosts;
 local configmanager = require "core.configmanager";
@@ -33,6 +41,11 @@ function activate(host, host_config)
                         or (configmanager.get(host, "core", "anonymous_login") 
                             and (configmanager.get(host, "core", "disallow_s2s") ~= false))
                      };
+       for option_name in pairs(host_config.core) do
+               if option_name:match("_ports$") then
+                       log("warn", "%s: Option '%s' has no effect for virtual hosts - put it in global Host \"*\" instead", host, option_name);
+               end
+       end
        log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
        eventmanager.fire_event("host-activated", host, host_config);
 end