X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=e13f85deb71cd55c38a867b7b9aecfda79c4435a;hb=70281db08732799bcd1ff4dcc3ca51b1388f1375;hp=993052202354141b9468fc3646c7b6f5a6703cb3;hpb=3e8fa633af5dfb52c846d51006ab40369b6ffdb9;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index 99305220..e13f85de 100644
--- a/net/connlisteners.lua
+++ b/net/connlisteners.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -13,8 +13,8 @@ local server = require "net.server";
 local log = require "util.logger".init("connlisteners");
 local tostring = tostring;
 
-local dofile, pcall, error = 
-	dofile, pcall, error
+local dofile, pcall, error =
+      dofile, pcall, error
 
 module "connlisteners"
 
@@ -57,9 +57,12 @@ function start(name, udata)
 	local port = (udata and udata.port) or h.default_port or error("Can't start listener "..name.." because no port was specified, and it has no default port", 0);
 	local mode = (udata and udata.mode) or h.default_mode or 1;
 	local ssl = (udata and udata.ssl) or nil;
-	local maxclients = 99999999;
 	local autossl = udata and udata.type == "ssl";
 	
+	if autossl and not ssl then
+		return nil, "no ssl context";
+	end
+	
 	return server.addserver(interface, port, h, mode, autossl and ssl or nil);
 end