diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-03-15 16:29:30 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-03-15 16:29:30 +0000 |
commit | 60b203533dbbb0404d9641e6455aaf6dad916dcb (patch) | |
tree | 45a5e26401ccd2e95749eb8b663dd11c696644cd /core/portmanager.lua | |
parent | 3c2e464d58249bad2f19d3fade6e38f5dccea2be (diff) | |
download | prosody-60b203533dbbb0404d9641e6455aaf6dad916dcb.tar.gz prosody-60b203533dbbb0404d9641e6455aaf6dad916dcb.zip |
portmanager: Support 'default_port' in service options
Diffstat (limited to 'core/portmanager.lua')
-rw-r--r-- | core/portmanager.lua | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/portmanager.lua b/core/portmanager.lua index 914a8e2f..c5bb936a 100644 --- a/core/portmanager.lua +++ b/core/portmanager.lua @@ -86,7 +86,9 @@ function activate_service(service_name) local bind_ports = set.new(config.get("*", config_prefix.."ports") or service_info.default_ports - or {listener.default_port}); -- COMPAT w/pre-0.9 + or {service_info.default_port + or listener.default_port -- COMPAT w/pre-0.9 + }); local mode = listener.default_mode or "*a"; local ssl; |