net.xmppcomponent_listener, mod_component: Removed useless undocumented option 'component_address'.

Tue, 21 Sep 2010 17:37:11 +0500

author
Waqas Hussain <waqas20@gmail.com>
date
Tue, 21 Sep 2010 17:37:11 +0500
changeset 3503
85e511e01d3c
parent 3502
28887137bb1b
child 3504
adbb015b237e

net.xmppcomponent_listener, mod_component: Removed useless undocumented option 'component_address'.

net/xmppcomponent_listener.lua file | annotate | diff | comparison | revisions
plugins/mod_component.lua file | annotate | diff | comparison | revisions
--- a/net/xmppcomponent_listener.lua	Tue Sep 21 17:24:25 2010 +0500
+++ b/net/xmppcomponent_listener.lua	Tue Sep 21 17:37:11 2010 +0500
@@ -73,13 +73,10 @@
 		return;
 	end
 	
-	-- Store the original host (this is used for config, etc.)
-	session.user = attr.to;
-	-- Set the host for future reference
-	session.host = config.get(attr.to, "core", "component_address") or attr.to;
 	-- Note that we don't create the internal component 
 	-- until after the external component auths successfully
 
+	session.host = attr.to;
 	session.streamid = uuid_gen();
 	session.notopen = nil;
 	
--- a/plugins/mod_component.lua	Tue Sep 21 17:24:25 2010 +0500
+++ b/plugins/mod_component.lua	Tue Sep 21 17:37:11 2010 +0500
@@ -31,9 +31,9 @@
 		return;
 	end
 	
-	local secret = config.get(session.user, "core", "component_secret");
+	local secret = config.get(session.host, "core", "component_secret");
 	if not secret then
-		(session.log or log)("warn", "Component attempted to identify as %s, but component_secret is not set", session.user);
+		(session.log or log)("warn", "Component attempted to identify as %s, but component_secret is not set", session.host);
 		session:close("not-authorized");
 		return;
 	end

mercurial