From aec590ec796f8cc608f837de695337f9310e3757 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Fri, 23 Sep 2016 16:09:46 +0200 Subject: util.dependencies: Set global 'ssl' for compat with LuaSec 0.6 (fixes #749) --- util/dependencies.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/dependencies.lua b/util/dependencies.lua index 4d50cf63..9ea211dd 100644 --- a/util/dependencies.lua +++ b/util/dependencies.lua @@ -99,6 +99,9 @@ function check_dependencies() ["luarocks"] = "luarocks install luasec"; ["Source"] = "http://www.inf.puc-rio.br/~brunoos/luasec/"; }, "SSL/TLS support will not be available"); + elseif not _G.ssl then + _G.ssl = ssl; + _G.ssl.context = require "ssl.context"; end local encodings, err = softreq "util.encodings" -- cgit v1.2.3 From 778aa7dbdd8dca0b65328f1c5cab14d7af5d5679 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 27 Sep 2016 22:01:13 +0100 Subject: prosodyctl: Fix copy/paste error in help text for deluser command --- prosodyctl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prosodyctl b/prosodyctl index 4c3ae981..e736b13e 100755 --- a/prosodyctl +++ b/prosodyctl @@ -361,8 +361,8 @@ function commands.deluser(arg) end local user, host = jid_split(arg[1]); if not user and host then - show_message [[Failed to understand JID, please supply the JID you want to set the password for]] - show_usage [[passwd user@host]] + show_message [[Failed to understand JID, please supply the JID to the user account you want to delete]] + show_usage [[deluser user@host]] return 1; end -- cgit v1.2.3 From 56cff1b44896ecab1571949b59ceec189acd289b Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 27 Sep 2016 22:01:46 +0100 Subject: mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered protocol issues --- plugins/mod_s2s/mod_s2s.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua index 4173fcfa..e038e5b4 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -365,7 +365,7 @@ function stream_callbacks.streamopened(session, attr) elseif session.direction == "outgoing" then session.notopen = nil; if not attr.id then - log("error", "Stream response did not give us a stream id!"); + log("warn", "Stream response did not give us a stream id!"); session:close({ condition = "undefined-condition", text = "Missing stream ID" }); return; end -- cgit v1.2.3 -- cgit v1.2.3