diff options
author | Melanie Thielker | 2016-12-10 18:36:10 +0000 |
---|---|---|
committer | Melanie Thielker | 2016-12-10 18:36:10 +0000 |
commit | 5ad8bceb1da94244c7f3b569e0b342b9c386a4aa (patch) | |
tree | 3ce19b559037432458037da578f5d2ecdb9df886 | |
parent | do not try xbakes on HG (diff) | |
download | opensim-SC-5ad8bceb1da94244c7f3b569e0b342b9c386a4aa.zip opensim-SC-5ad8bceb1da94244c7f3b569e0b342b9c386a4aa.tar.gz opensim-SC-5ad8bceb1da94244c7f3b569e0b342b9c386a4aa.tar.bz2 opensim-SC-5ad8bceb1da94244c7f3b569e0b342b9c386a4aa.tar.xz |
Fix OpenSim bombing when a MySQL connection string doesn't contain a password.
Passwordless connection is perfectly legal and makes sense within a
container.
-rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 01a06cd..a6fd99f 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
@@ -1685,6 +1685,8 @@ namespace OpenSim.Framework | |||
1685 | 1685 | ||
1686 | // hide the password in the connection string | 1686 | // hide the password in the connection string |
1687 | passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); | 1687 | passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); |
1688 | if (passPosition == -1) | ||
1689 | return connectionString; | ||
1688 | passPosition = connectionString.IndexOf("=", passPosition); | 1690 | passPosition = connectionString.IndexOf("=", passPosition); |
1689 | if (passPosition < connectionString.Length) | 1691 | if (passPosition < connectionString.Length) |
1690 | passPosition += 1; | 1692 | passPosition += 1; |