# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1422707100 0
# Node ID f0a2bdfd0ceac28c8bca921fc606b9676f7e68a9
# Parent  2b5ced5ca31f0e42c085d4cc5a108edebbaf057a# Parent  bae84401a02c14c49631ee08565cd008dfb906ae
Merge with 0.10

diff -r 2b5ced5ca31f -r f0a2bdfd0cea core/sessionmanager.lua
--- a/core/sessionmanager.lua	Fri Jan 30 14:21:51 2015 +0000
+++ b/core/sessionmanager.lua	Sat Jan 31 12:25:00 2015 +0000
@@ -117,6 +117,16 @@
 	if session.resource then return nil, "cancel", "already-bound", "Cannot bind multiple resources on a single connection"; end
 	-- We don't support binding multiple resources
 
+	local event_payload = { session = session, resource = resource };
+	if hosts[session.host].events.fire_event("pre-resource-bind", event_payload) == false then
+		local err = event_payload.error;
+		if err then return nil, err.type, err.condition, err.text; end
+		return nil, "cancel", "not-allowed";
+	else
+		-- In case a plugin wants to poke at it
+		resource = event_payload.resource;
+	end
+
 	resource = resourceprep(resource);
 	resource = resource ~= "" and resource or uuid_generate();
 	--FIXME: Randomly-generated resources must be unique per-user, and never conflict with existing