aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthias Diene <devnull@localhost>2009-07-23 12:01:00 +0100
committerMatthias Diene <devnull@localhost>2009-07-23 12:01:00 +0100
commit23a10d0390865c0e359e3a2e8faa53bd332a2941 (patch)
tree39da13a748a6fdba29c9eb1c4af5a2d422759e0b /net
parent3417c24b8854ccf3cad8249e80ab9c81bb2081a2 (diff)
downloadprosody-23a10d0390865c0e359e3a2e8faa53bd332a2941.tar.gz
prosody-23a10d0390865c0e359e3a2e8faa53bd332a2941.zip
net.server: Fail to open port if legacy SSL requested, but SSL not available
Diffstat (limited to 'net')
-rw-r--r--net/server.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua
index 6ff39926..6fe72712 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -190,7 +190,12 @@ wrapserver = function( listeners, socket, ip, serverport, pattern, sslctx, maxco
end
if not ssl then
sslctx = false;
- out_put("server.lua: ", "ssl not enabled on ", serverport);
+ if startssl then
+ out_error( "server.lua: Cannot start ssl on port: ", serverport )
+ return nil, "Cannot start ssl, see log for details"
+ else
+ out_put("server.lua: ", "ssl not enabled on ", serverport);
+ end
end
local accept = socket.accept