aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2009-12-16 00:11:54 +0500
committerWaqas Hussain <waqas20@gmail.com>2009-12-16 00:11:54 +0500
commit34e97d4a3c9545f71af8302b661b642b7b120a84 (patch)
treeb2098506f57d9fb31352379bff6da737ca7d2a6f
parent96f384546f67728840de4d7c2d8bfb69867ae6f4 (diff)
downloadprosody-34e97d4a3c9545f71af8302b661b642b7b120a84.tar.gz
prosody-34e97d4a3c9545f71af8302b661b642b7b120a84.zip
prosody: Fixed a possible nil concatenation.
-rwxr-xr-xprosody4
1 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index 6ff7743d..0577179f 100755
--- a/prosody
+++ b/prosody
@@ -208,8 +208,8 @@ function init_global_state()
cl.start(listener, {
ssl = conntype ~= "tcp" and global_ssl_ctx,
port = port,
- interface = config.get("*", "core", option.."_interface")
- or cl.get(listener).default_interface
+ interface = (option and config.get("*", "core", option.."_interface"))
+ or cl.get(listener).default_interface
or config.get("*", "core", "interface"),
type = conntype
});