diff options
| author | Teravus Ovares (Dan Olivares) | 2009-08-29 23:50:24 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-08-29 23:50:24 -0400 |
| commit | 2f40161f38967e3362ac7be43b74d5cbc75564fa (patch) | |
| tree | db14920568864a932a064a4530d006fc67c60a5f /OpenSim/Server | |
| parent | Ok, merging the RegionCombinerModule with master. (diff) | |
| parent | Remove another IAuthentificationInterface user (diff) | |
| download | opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.zip opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.gz opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.bz2 opensim-SC_OLD-2f40161f38967e3362ac7be43b74d5cbc75564fa.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | 13 | ||||
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs index 3de2245..c0933a8 100644 --- a/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs +++ b/OpenSim/Server/Handlers/Neighbour/NeighbourHandlers.cs | |||
| @@ -110,12 +110,13 @@ namespace OpenSim.Server.Handlers.Neighbour | |||
| 110 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; | 110 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; |
| 111 | return result; | 111 | return result; |
| 112 | } | 112 | } |
| 113 | if (!m_AuthenticationService.VerifyKey(regionID, authToken)) | 113 | // TODO: Rethink this |
| 114 | { | 114 | //if (!m_AuthenticationService.VerifyKey(regionID, authToken)) |
| 115 | m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); | 115 | //{ |
| 116 | httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; | 116 | // m_log.InfoFormat("[RegionPostHandler]: Authentication failed for neighbour message {0}", path); |
| 117 | return result; | 117 | // httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; |
| 118 | } | 118 | // return result; |
| 119 | //} | ||
| 119 | m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID); | 120 | m_log.DebugFormat("[RegionPostHandler]: Authentication succeeded for {0}", regionID); |
| 120 | } | 121 | } |
| 121 | 122 | ||
diff --git a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs index 6c0b705..822edcb 100644 --- a/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/AgentHandlers.cs | |||
| @@ -109,12 +109,13 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 109 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; | 109 | httpResponse.StatusCode = (int)HttpStatusCode.Unauthorized; |
| 110 | return result; | 110 | return result; |
| 111 | } | 111 | } |
| 112 | if (!m_AuthenticationService.VerifyKey(agentID, authToken)) | 112 | // TODO: Rethink this |
| 113 | { | 113 | //if (!m_AuthenticationService.VerifyKey(agentID, authToken)) |
| 114 | m_log.InfoFormat("[AgentPostHandler]: Authentication failed for agent message {0}", path); | 114 | //{ |
| 115 | httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; | 115 | // m_log.InfoFormat("[AgentPostHandler]: Authentication failed for agent message {0}", path); |
| 116 | return result; | 116 | // httpResponse.StatusCode = (int)HttpStatusCode.Forbidden; |
| 117 | } | 117 | // return result; |
| 118 | //} | ||
| 118 | m_log.DebugFormat("[AgentPostHandler]: Authentication succeeded for {0}", agentID); | 119 | m_log.DebugFormat("[AgentPostHandler]: Authentication succeeded for {0}", agentID); |
| 119 | } | 120 | } |
| 120 | 121 | ||