# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1465754790 -7200
# Node ID 76a8456cf1e23cf6ca0063c324f4fc4189554e7e
# Parent  d916703d5e18ad88f55d0cb87a2eef3c1443922d# Parent  82d8c11ab0cbce230beefc0468deb820f1db9c13
Merge 0.10->trunk

diff -r d916703d5e18 -r 76a8456cf1e2 plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Thu Jun 09 14:04:50 2016 +0200
+++ b/plugins/mod_pep.lua	Sun Jun 12 20:06:30 2016 +0200
@@ -47,11 +47,10 @@
 end
 
 module:hook("pep-publish-item", function (event)
-	local session, node, id, item = event.session, event.node, event.id, event.item;
+	local session, bare, node, id, item = event.session, event.user, event.node, event.id, event.item;
 	item.attr.xmlns = nil;
 	local disable = #item.tags ~= 1 or #item.tags[1] == 0;
 	if #item.tags == 0 then item.name = "retract"; end
-	local bare = session.username..'@'..session.host;
 	local stanza = st.message({from=bare, type='headline'})
 		:tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'})
 			:tag('items', {node=node})
@@ -183,7 +182,7 @@
 				payload.attr.id = id;
 				session.send(st.reply(stanza));
 				module:fire_event("pep-publish-item", {
-					node = node, actor = session.jid, id = id, session = session, item = st.clone(payload);
+					node = node, user = jid_bare(session.full_jid), actor = session.jid, id = id, session = session, item = st.clone(payload);
 				});
 				return true;
 			end
diff -r d916703d5e18 -r 76a8456cf1e2 prosodyctl
--- a/prosodyctl	Thu Jun 09 14:04:50 2016 +0200
+++ b/prosodyctl	Sun Jun 12 20:06:30 2016 +0200
@@ -974,9 +974,10 @@
 				print("    For more information see https://prosody.im/doc/storage");
 			end
 		end
+		local require_encryption = set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty();
 		local ssl = dependencies.softreq"ssl";
 		if not ssl then
-			if not set.intersection(all_options, set.new({"require_encryption", "c2s_require_encryption", "s2s_require_encryption"})):empty() then
+			if not require_encryption then
 				print("");
 				print("    You require encryption but LuaSec is not available.");
 				print("    Connections will fail.");
@@ -1006,6 +1007,11 @@
 					ok = false;
 				end
 			end
+		elseif require_encryption and not all_modules:contains("tls") then
+			print("");
+			print("    You require encryption but mod_tls is not enabled.");
+			print("    Connections will fail.");
+			ok = false;
 		end
 		
 		print("Done.\n");