prosody
1ef9aa0c9fb0%3Ad5bb9cd2e6df

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

5088:d5bb9cd2e6df

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 10 Aug 2012 16:32:40 +0100
parents 5087:71a5a6a6c74c (diff) 5086:1ef9aa0c9fb0 (current diff)
children 5089:a5b683909f79 5090:61c7c53c06d5
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/core/portmanager.lua	Thu Aug 09 07:17:25 2012 +0500
+++ b/core/portmanager.lua	Fri Aug 10 16:32:40 2012 +0100
@@ -82,7 +82,7 @@
 
 	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 (service_info.private and (config.get("*", "local_interfaces") or default_local_interfaces))
 		or config.get("*", "interfaces")
 		or config.get("*", "interface") -- COMPAT w/pre-0.9
 		or listener.default_interface -- COMPAT w/pre0.9