aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authorMelanie2012-03-04 16:23:19 +0000
committerMelanie2012-03-04 16:23:19 +0000
commit6338996f87ca1314c493709d42b1c606f5688676 (patch)
tree5ea7bd2c640390c19ef787360d71ac97851db43f /OpenSim/Server
parentMerge branch 'master' into careminster (diff)
parentAdd WebProfiles config to other config example (diff)
downloadopensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.zip
opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.gz
opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.bz2
opensim-SC_OLD-6338996f87ca1314c493709d42b1c606f5688676.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
index 440b898..dfed761 100644
--- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
+++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
@@ -248,7 +248,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
248 if (passwordValues != null && passwordValues.Length == 1) 248 if (passwordValues != null && passwordValues.Length == 1)
249 { 249 {
250 if (account != null && 250 if (account != null &&
251 (m_authenticationService.Authenticate(account.PrincipalID, passwordValues[0], 30) != string.Empty)) 251 (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty))
252 authRequest.IsAuthenticated = true; 252 authRequest.IsAuthenticated = true;
253 else 253 else
254 authRequest.IsAuthenticated = false; 254 authRequest.IsAuthenticated = false;