aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Authorization
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Services/Connectors/Authorization
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Services/Connectors/Authorization')
-rw-r--r--OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs16
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
index d2da85f..a130f71 100644
--- a/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Authorization/AuthorizationServicesConnector.cs
@@ -37,7 +37,7 @@ using OpenMetaverse;
37 37
38namespace OpenSim.Services.Connectors 38namespace OpenSim.Services.Connectors
39{ 39{
40 public class AuthorizationServicesConnector 40 public class AuthorizationServicesConnector
41 { 41 {
42 private static readonly ILog m_log = 42 private static readonly ILog m_log =
43 LogManager.GetLogger( 43 LogManager.GetLogger(
@@ -45,7 +45,7 @@ namespace OpenSim.Services.Connectors
45 45
46 private string m_ServerURI = String.Empty; 46 private string m_ServerURI = String.Empty;
47 private bool m_ResponseOnFailure = true; 47 private bool m_ResponseOnFailure = true;
48 48
49 public AuthorizationServicesConnector() 49 public AuthorizationServicesConnector()
50 { 50 {
51 } 51 }
@@ -78,11 +78,11 @@ namespace OpenSim.Services.Connectors
78 throw new Exception("Authorization connector init error"); 78 throw new Exception("Authorization connector init error");
79 } 79 }
80 m_ServerURI = serviceURI; 80 m_ServerURI = serviceURI;
81 81
82 // this dictates what happens if the remote service fails, if the service fails and the value is true 82 // this dictates what happens if the remote service fails, if the service fails and the value is true
83 // the user is authorized for the region. 83 // the user is authorized for the region.
84 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true); 84 bool responseOnFailure = authorizationConfig.GetBoolean("ResponseOnFailure",true);
85 85
86 m_ResponseOnFailure = responseOnFailure; 86 m_ResponseOnFailure = responseOnFailure;
87 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized"); 87 m_log.Info("[AUTHORIZATION CONNECTOR]: AuthorizationService initialized");
88 } 88 }
@@ -91,11 +91,11 @@ namespace OpenSim.Services.Connectors
91 { 91 {
92 // do a remote call to the authorization server specified in the AuthorizationServerURI 92 // do a remote call to the authorization server specified in the AuthorizationServerURI
93 m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI); 93 m_log.InfoFormat("[AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} at remote server {1}", userID, m_ServerURI);
94 94
95 string uri = m_ServerURI; 95 string uri = m_ServerURI;
96 96
97 AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID); 97 AuthorizationRequest req = new AuthorizationRequest(userID, firstname, surname, email, regionName, regionID);
98 98
99 AuthorizationResponse response; 99 AuthorizationResponse response;
100 try 100 try
101 { 101 {
@@ -114,7 +114,7 @@ namespace OpenSim.Services.Connectors
114 } 114 }
115 m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message); 115 m_log.DebugFormat("[AUTHORIZATION CONNECTOR] response from remote service was {0}", response.Message);
116 message = response.Message; 116 message = response.Message;
117 117
118 return response.IsAuthorized; 118 return response.IsAuthorized;
119 } 119 }
120 120