diff options
author | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-06 07:52:41 +0000 |
commit | 7d89e122930be39e84a6d174548fa2d12ac0484a (patch) | |
tree | e5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/MySQL/MySQLGridData.cs | |
parent | * minor: speculatively try a change to bamboo.build to see if this generates ... (diff) | |
download | opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2 opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz |
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLGridData.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index 9dc3d18..fa5b33c 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Reflection; | 31 | using System.Reflection; |
32 | using libsecondlife; | 32 | using OpenMetaverse; |
33 | using log4net; | 33 | using log4net; |
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | 35 | ||
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL | |||
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); | 124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); |
125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); | 127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); |
@@ -322,7 +322,7 @@ namespace OpenSim.Data.MySQL | |||
322 | /// </summary> | 322 | /// </summary> |
323 | /// <param name="uuid">The region UUID</param> | 323 | /// <param name="uuid">The region UUID</param> |
324 | /// <returns>The sim profile</returns> | 324 | /// <returns>The sim profile</returns> |
325 | override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) | 325 | override public RegionProfileData GetProfileByUUID(UUID uuid) |
326 | { | 326 | { |
327 | MySQLSuperManager dbm = GetLockedConnection(); | 327 | MySQLSuperManager dbm = GetLockedConnection(); |
328 | 328 | ||
@@ -458,14 +458,14 @@ namespace OpenSim.Data.MySQL | |||
458 | /// <param name="handle">The attempted regionHandle of the challenger</param> | 458 | /// <param name="handle">The attempted regionHandle of the challenger</param> |
459 | /// <param name="authkey">The secret</param> | 459 | /// <param name="authkey">The secret</param> |
460 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> | 460 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> |
461 | override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) | 461 | override public bool AuthenticateSim(UUID uuid, ulong handle, string authkey) |
462 | { | 462 | { |
463 | bool throwHissyFit = false; // Should be true by 1.0 | 463 | bool throwHissyFit = false; // Should be true by 1.0 |
464 | 464 | ||
465 | if (throwHissyFit) | 465 | if (throwHissyFit) |
466 | throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); | 466 | throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); |
467 | 467 | ||
468 | RegionProfileData data = GetProfileByLLUUID(uuid); | 468 | RegionProfileData data = GetProfileByUUID(uuid); |
469 | 469 | ||
470 | return (handle == data.regionHandle && authkey == data.regionSecret); | 470 | return (handle == data.regionHandle && authkey == data.regionSecret); |
471 | } | 471 | } |
@@ -479,7 +479,7 @@ namespace OpenSim.Data.MySQL | |||
479 | /// <param name="authhash"></param> | 479 | /// <param name="authhash"></param> |
480 | /// <param name="challenge"></param> | 480 | /// <param name="challenge"></param> |
481 | /// <returns></returns> | 481 | /// <returns></returns> |
482 | public bool AuthenticateSim(LLUUID uuid, ulong handle, string authhash, string challenge) | 482 | public bool AuthenticateSim(UUID uuid, ulong handle, string authhash, string challenge) |
483 | { | 483 | { |
484 | // SHA512Managed HashProvider = new SHA512Managed(); | 484 | // SHA512Managed HashProvider = new SHA512Managed(); |
485 | // Encoding TextProvider = new UTF8Encoding(); | 485 | // Encoding TextProvider = new UTF8Encoding(); |