diff options
| author | lbsa71 | 2008-01-11 07:41:14 +0000 |
|---|---|---|
| committer | lbsa71 | 2008-01-11 07:41:14 +0000 |
| commit | 8ccc470e2a40e95a654011be939700e68236a52a (patch) | |
| tree | 8471a5cea615f5803a93aed7455cedb0d62ad71b | |
| parent | * Just an update to the default login form (diff) | |
| download | opensim-SC_OLD-8ccc470e2a40e95a654011be939700e68236a52a.zip opensim-SC_OLD-8ccc470e2a40e95a654011be939700e68236a52a.tar.gz opensim-SC_OLD-8ccc470e2a40e95a654011be939700e68236a52a.tar.bz2 opensim-SC_OLD-8ccc470e2a40e95a654011be939700e68236a52a.tar.xz | |
* quick fix to fix if webLoginKey is null in DB, return random key (I guess LLUUID.Zero would be a security hazard)
| -rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index 223d902..1032145 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs | |||
| @@ -446,7 +446,15 @@ namespace OpenSim.Framework.Data.MySQL | |||
| 446 | 446 | ||
| 447 | retval.profileImage = new LLUUID((string) reader["profileImage"]); | 447 | retval.profileImage = new LLUUID((string) reader["profileImage"]); |
| 448 | retval.profileFirstImage = new LLUUID((string) reader["profileFirstImage"]); | 448 | retval.profileFirstImage = new LLUUID((string) reader["profileFirstImage"]); |
| 449 | retval.webLoginKey = new LLUUID((string)reader["webLoginKey"]); | 449 | |
| 450 | if( reader.IsDBNull( reader.GetOrdinal( "webLoginKey" ) ) ) | ||
| 451 | { | ||
| 452 | retval.webLoginKey = LLUUID.Random(); | ||
| 453 | } | ||
| 454 | else | ||
| 455 | { | ||
| 456 | retval.webLoginKey = new LLUUID((string)reader["webLoginKey"]); | ||
| 457 | } | ||
| 450 | } | 458 | } |
| 451 | else | 459 | else |
| 452 | { | 460 | { |