Software / code / prosody
Changeset
4687:bd3a852b949a
portmanager: Fix selecting bind_interfaces from pre-0.9 config options.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 25 Apr 2012 14:53:54 +0200 |
| parents | 4686:5fd661424b9f |
| children | 4688:8d275c86a04f |
| files | core/portmanager.lua |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/portmanager.lua Wed Apr 25 03:56:26 2012 +0100 +++ b/core/portmanager.lua Wed Apr 25 14:53:54 2012 +0200 @@ -76,13 +76,14 @@ config_prefix = ""; end - local bind_interfaces = set.new(config.get("*", config_prefix.."interfaces") + local bind_interfaces = config.get("*", config_prefix.."interfaces") or config.get("*", config_prefix.."interface") -- COMPAT w/pre-0.9 or (service_info.private and default_local_interfaces) or config.get("*", "interfaces") or config.get("*", "interface") -- COMPAT w/pre-0.9 or listener.default_interface -- COMPAT w/pre0.9 - or default_interfaces); + or default_interfaces + bind_interfaces = set.new(type(bind_interfaces)~="table" and {bind_interfaces} or bind_interfaces); local bind_ports = set.new(config.get("*", config_prefix.."ports") or service_info.default_ports
