diff options
author | Justin Clark-Casey (justincc) | 2009-09-24 14:54:12 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-24 14:54:12 +0100 |
commit | 7870152d23db4cb6f5834d4921fac17feb717220 (patch) | |
tree | ccfd000db77de790908b6480785c78151859886b /OpenSim/Region/Communications/Local/LocalUserServices.cs | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-7870152d23db4cb6f5834d4921fac17feb717220.zip opensim-SC_OLD-7870152d23db4cb6f5834d4921fac17feb717220.tar.gz opensim-SC_OLD-7870152d23db4cb6f5834d4921fac17feb717220.tar.bz2 opensim-SC_OLD-7870152d23db4cb6f5834d4921fac17feb717220.tar.xz |
Allow load/save iar password checks to be done in grid mode
This should allow load/save iar to work for grid mode as long as the grid user service is later than this revision
Grid services of earlier revisions will always erroneously report incorrect password. This will be addressed shortly.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalUserServices.cs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs index af4fb37..d18937e 100644 --- a/OpenSim/Region/Communications/Local/LocalUserServices.cs +++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs | |||
@@ -80,6 +80,21 @@ namespace OpenSim.Region.Communications.Local | |||
80 | throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running."); | 80 | throw new Exception("[LOCAL USER SERVICES]: Unknown master user UUID. Possible reason: UserServer is not running."); |
81 | } | 81 | } |
82 | return data; | 82 | return data; |
83 | } | 83 | } |
84 | |||
85 | public override bool AuthenticateUserByPassword(UUID userID, string password) | ||
86 | { | ||
87 | UserProfileData userProfile = GetUserProfile(userID); | ||
88 | |||
89 | if (null == userProfile) | ||
90 | return false; | ||
91 | |||
92 | string md5PasswordHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + userProfile.PasswordSalt); | ||
93 | |||
94 | if (md5PasswordHash == userProfile.PasswordHash) | ||
95 | return true; | ||
96 | else | ||
97 | return false; | ||
98 | } | ||
84 | } | 99 | } |
85 | } | 100 | } \ No newline at end of file |