X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=net%2Fconnlisteners.lua;h=e13f85deb71cd55c38a867b7b9aecfda79c4435a;hb=c65679cbdff89c90699b7706dec4826d2a5ac9c4;hp=a9b92a8c81a47a2ce1957a8fbe7267f00aee55d9;hpb=d6cb84504d81d96699a663cc0d6b284900c60d70;p=prosody.git

diff --git a/net/connlisteners.lua b/net/connlisteners.lua
index a9b92a8c..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"
 
@@ -53,22 +53,17 @@ function start(name, udata)
 		error("No such connection module: "..name.. (err and (" ("..err..")") or ""), 0);
 	end
 	
-	if udata then
-		if (udata.type == "ssl" or udata.type == "tls") and not udata.ssl then
-			error("No SSL context supplied for a "..tostring(udata.type):upper().." connection!", 0);
-		elseif udata.ssl and udata.type == "tcp" then
-			error("SSL context supplied for a TCP connection!", 0);
-		end
-	end
-	
 	local interface = (udata and udata.interface) or h.default_interface or "*";
 	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";
 	
-	return server.addserver(interface, port, h, mode, ssl, autossl);
+	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
 
 return _M;