1 files changed, 62 insertions, 62 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
index 2b4c380..2d31564 100644
--- a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
+++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -1,62 +1,62 @@
-/*
+/*
- * Copyright (c) Contributors, http://opensimulator.org/
+ * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
+ *
- * Redistribution and use in source and binary forms, with or without
+ * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
+ *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
+ *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
+ *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
+ *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
+ *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
+ *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
+ *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
+ *       derived from this software without specific prior written permission.
- *
+ *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ */
-using System;
+using System;
-using Nini.Config;
+using Nini.Config;
-using OpenSim.Server.Base;
+using OpenSim.Server.Base;
-using OpenSim.Services.Interfaces;
+using OpenSim.Services.Interfaces;
-using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Server.Handlers.Base;
+using OpenSim.Server.Handlers.Base;
-namespace OpenSim.Server.Handlers.Authentication
+namespace OpenSim.Server.Handlers.Authentication
-{
+{
-    public class HGAuthServiceInConnector : ServiceConnector
+    public class HGAuthServiceInConnector : ServiceConnector
-    {
+    {
-        private IAuthenticationService m_AuthenticationService;
+        private IAuthenticationService m_AuthenticationService;
-        public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
+        public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+                base(config, server)
-        {
+        {
-            IConfig serverConfig = config.Configs["AuthenticationService"];
+            IConfig serverConfig = config.Configs["AuthenticationService"];
-            if (serverConfig == null)
+            if (serverConfig == null)
-                throw new Exception("No section 'AuthenticationService' in config file");
+                throw new Exception("No section 'AuthenticationService' in config file");
-            string authenticationService = serverConfig.GetString("LocalServiceModule",
+            string authenticationService = serverConfig.GetString("LocalServiceModule",
-                    String.Empty);
+                    String.Empty);
-            if (authenticationService == String.Empty)
+            if (authenticationService == String.Empty)
-                throw new Exception("No AuthenticationService in config file");
+                throw new Exception("No AuthenticationService in config file");
-            Object[] args = new Object[] { config };
+            Object[] args = new Object[] { config };
-            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
+            m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
-            HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
+            HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
-            server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
+            server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
-            server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
+            server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
-        }
+        }
-    }
+    }
-}
+}

diff --git a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs index 2b4c380..2d31564 100644 --- a/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs +++ b/OpenSim/Server/Handlers/Authentication/HGAuthServerConnector.cs
@@ -1,62 +1,62 @@
1	/*	1	/*
2	* Copyright (c) Contributors, http://opensimulator.org/	2	* Copyright (c) Contributors, http://opensimulator.org/
3	* See CONTRIBUTORS.TXT for a full list of copyright holders.	3	* See CONTRIBUTORS.TXT for a full list of copyright holders.
4	*	4	*
5	* Redistribution and use in source and binary forms, with or without	5	* Redistribution and use in source and binary forms, with or without
6	* modification, are permitted provided that the following conditions are met:	6	* modification, are permitted provided that the following conditions are met:
7	* * Redistributions of source code must retain the above copyright	7	* * Redistributions of source code must retain the above copyright
8	* notice, this list of conditions and the following disclaimer.	8	* notice, this list of conditions and the following disclaimer.
9	* * Redistributions in binary form must reproduce the above copyright	9	* * Redistributions in binary form must reproduce the above copyright
10	* notice, this list of conditions and the following disclaimer in the	10	* notice, this list of conditions and the following disclaimer in the
11	* documentation and/or other materials provided with the distribution.	11	* documentation and/or other materials provided with the distribution.
12	* * Neither the name of the OpenSimulator Project nor the	12	* * Neither the name of the OpenSimulator Project nor the
13	* names of its contributors may be used to endorse or promote products	13	* names of its contributors may be used to endorse or promote products
14	* derived from this software without specific prior written permission.	14	* derived from this software without specific prior written permission.
15	*	15	*
16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY	16	* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED	17	* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE	18	* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY	19	* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES	20	* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;	21	* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND	22	* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT	23	* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS	24	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.	25	* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26	*/	26	*/
27		27
28	using System;	28	using System;
29	using Nini.Config;	29	using Nini.Config;
30	using OpenSim.Server.Base;	30	using OpenSim.Server.Base;
31	using OpenSim.Services.Interfaces;	31	using OpenSim.Services.Interfaces;
32	using OpenSim.Framework.Servers.HttpServer;	32	using OpenSim.Framework.Servers.HttpServer;
33	using OpenSim.Server.Handlers.Base;	33	using OpenSim.Server.Handlers.Base;
34		34
35	namespace OpenSim.Server.Handlers.Authentication	35	namespace OpenSim.Server.Handlers.Authentication
36	{	36	{
37	public class HGAuthServiceInConnector : ServiceConnector	37	public class HGAuthServiceInConnector : ServiceConnector
38	{	38	{
39	private IAuthenticationService m_AuthenticationService;	39	private IAuthenticationService m_AuthenticationService;
40		40
41	public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :	41	public HGAuthServiceInConnector(IConfigSource config, IHttpServer server) :
42	base(config, server)	42	base(config, server)
43	{	43	{
44	IConfig serverConfig = config.Configs["AuthenticationService"];	44	IConfig serverConfig = config.Configs["AuthenticationService"];
45	if (serverConfig == null)	45	if (serverConfig == null)
46	throw new Exception("No section 'AuthenticationService' in config file");	46	throw new Exception("No section 'AuthenticationService' in config file");
47		47
48	string authenticationService = serverConfig.GetString("LocalServiceModule",	48	string authenticationService = serverConfig.GetString("LocalServiceModule",
49	String.Empty);	49	String.Empty);
50		50
51	if (authenticationService == String.Empty)	51	if (authenticationService == String.Empty)
52	throw new Exception("No AuthenticationService in config file");	52	throw new Exception("No AuthenticationService in config file");
53		53
54	Object[] args = new Object[] { config };	54	Object[] args = new Object[] { config };
55	m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);	55	m_AuthenticationService = ServerUtils.LoadPlugin<IAuthenticationService>(authenticationService, args);
56		56
57	HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);	57	HGAuthenticationHandlers m_handlers = new HGAuthenticationHandlers(m_AuthenticationService);
58	server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);	58	server.AddXmlRPCHandler("hg_new_auth_key", m_handlers.GenerateKeyMethod);
59	server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);	59	server.AddXmlRPCHandler("hg_verify_auth_key", m_handlers.VerifyKeyMethod);
60	}	60	}
61	}	61	}
62	}	62	}