diff options
| author | Justin Clark-Casey (justincc) | 2009-09-16 18:21:46 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-09-16 18:21:46 +0100 |
| commit | a4c093469ae953971493977facbc81c49761577d (patch) | |
| tree | 004f10f20c7e4d38088bf1eea8b5d2dd61a126df /OpenSim/Region/CoreModules | |
| parent | on iar save/load, let the user know if they put in the wrong password (diff) | |
| parent | updated the IAuthorizationService interface so that a message is passed back ... (diff) | |
| download | opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.zip opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.gz opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.bz2 opensim-SC_OLD-a4c093469ae953971493977facbc81c49761577d.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs index c52c257..e69613a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs | |||
| @@ -132,9 +132,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
| 132 | 132 | ||
| 133 | } | 133 | } |
| 134 | 134 | ||
| 135 | public bool IsAuthorizedForRegion(string userID, string regionID) | 135 | public bool IsAuthorizedForRegion(string userID, string regionID, out string message) |
| 136 | { | 136 | { |
| 137 | return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID); | 137 | return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| 140 | } | 140 | } |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index 9241851..a672f4f 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs | |||
| @@ -117,11 +117,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
| 117 | 117 | ||
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | public bool IsAuthorizedForRegion(string userID, string regionID) | 120 | public bool IsAuthorizedForRegion(string userID, string regionID, out string message) |
| 121 | { | 121 | { |
| 122 | m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID); | 122 | m_log.InfoFormat("[REMOTE AUTHORIZATION CONNECTOR]: IsAuthorizedForRegion checking {0} for region {1}", userID, regionID); |
| 123 | 123 | ||
| 124 | bool isAuthorized = true; | 124 | bool isAuthorized = true; |
| 125 | message = String.Empty; | ||
| 125 | 126 | ||
| 126 | // get the scene this call is being made for | 127 | // get the scene this call is being made for |
| 127 | Scene scene = null; | 128 | Scene scene = null; |
| @@ -140,7 +141,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization | |||
| 140 | { | 141 | { |
| 141 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); | 142 | UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); |
| 142 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, | 143 | isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, |
| 143 | profile.Email, scene.RegionInfo.RegionName, regionID); | 144 | profile.Email, scene.RegionInfo.RegionName, regionID, out message); |
| 144 | } | 145 | } |
| 145 | else | 146 | else |
| 146 | { | 147 | { |