aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-02-13 16:08:43 +0000
committerMatthew Wild <mwild1@gmail.com>2010-02-13 16:08:43 +0000
commitcec65108c99a2291c993b9a11c83fa43a289f4f9 (patch)
tree0eeacebbb139c9d2dd4052ffd5e2bf7c90652497
parent2cdf73b6c3d8253849b68c9293f7df8550dc466b (diff)
downloadprosody-cec65108c99a2291c993b9a11c83fa43a289f4f9.tar.gz
prosody-cec65108c99a2291c993b9a11c83fa43a289f4f9.zip
certmanager, hostmanager: Rename get_context() to create_context() to be more explicit about what it does
-rw-r--r--core/certmanager.lua2
-rw-r--r--core/hostmanager.lua4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/certmanager.lua b/core/certmanager.lua
index e5fabdce..64644be9 100644
--- a/core/certmanager.lua
+++ b/core/certmanager.lua
@@ -18,7 +18,7 @@ local default_ssl_ctx_in_mt = { __index = default_ssl_ctx_in };
-- Global SSL options if not overridden per-host
local default_ssl_config = configmanager.get("*", "core", "ssl");
-function get_context(host, mode, config)
+function create_context(host, mode, config)
local ssl_config = config and config.core.ssl or default_ssl_config;
if ssl and ssl_config then
return ssl_newcontext(setmetatable(ssl_config, mode == "client" and default_ssl_ctx_mt or default_ssl_ctx_in_mt));
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index f8d7400d..7071296f 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -65,8 +65,8 @@ function activate(host, host_config)
end
end
- hosts[host].ssl_ctx = certmanager.get_context(host, "client", host_config); -- for outgoing connections
- hosts[host].ssl_ctx_in = certmanager.get_context(host, "server", host_config); -- for incoming connections
+ hosts[host].ssl_ctx = certmanager.create_context(host, "client", host_config); -- for outgoing connections
+ hosts[host].ssl_ctx_in = certmanager.create_context(host, "server", host_config); -- for incoming connections
log((hosts_loaded_once and "info") or "debug", "Activated host: %s", host);
eventmanager.fire_event("host-activated", host, host_config);