# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1279178876 -3600
# Node ID 395f692b3182f649616cebb6ded4ec7cfb0fde59
# Parent  7c87af1c9a6895e3af7dd1cad67d6e899fbe58a8# Parent  5b32e6f8439208bc4e5521fba565466a6a4f0d2a
Merge with backout

diff -r 5b32e6f84392 -r 395f692b3182 core/certmanager.lua
--- a/core/certmanager.lua	Thu Jul 15 08:25:50 2010 +0100
+++ b/core/certmanager.lua	Thu Jul 15 08:27:56 2010 +0100
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- 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.
+--
+
 local configmanager = require "core.configmanager";
 local log = require "util.logger".init("certmanager");
 local ssl = ssl;
@@ -12,11 +20,12 @@
 
 -- Global SSL options if not overridden per-host
 local default_ssl_config = configmanager.get("*", "core", "ssl");
+local default_capath = "/etc/ssl/certs";
 
 function create_context(host, mode, config)
-	if not ssl then return nil; end
-	
 	local user_ssl_config = config and config.core.ssl or default_ssl_config;
+
+	if not(ssl and user_ssl_config) then return nil; end
 	
 	local ssl_config = {
 		mode = mode;