aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2009-06-09 12:11:22 +0000
committerDr Scofield2009-06-09 12:11:22 +0000
commit28324e5174f22dba7dbcfd152fc3d13703aaed0f (patch)
tree3579fbc9c9e880036b76d886766014e798737d6a
parentAdded Snoopy to CONTRIBUTIRS.txt (diff)
downloadopensim-SC_OLD-28324e5174f22dba7dbcfd152fc3d13703aaed0f.zip
opensim-SC_OLD-28324e5174f22dba7dbcfd152fc3d13703aaed0f.tar.gz
opensim-SC_OLD-28324e5174f22dba7dbcfd152fc3d13703aaed0f.tar.bz2
opensim-SC_OLD-28324e5174f22dba7dbcfd152fc3d13703aaed0f.tar.xz
ARGH!!!! note to self: ALWAYS use String.IsNullOrEmpty(...)!
this patch fixes RemoteAdminPlugin gratuitously updating the user password even if no update was intended.
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 47240a1..f7171ff 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1115,8 +1115,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1115 if (null == userProfile) 1115 if (null == userProfile)
1116 throw new Exception(String.Format("avatar {0} {1} does not exist", firstname, lastname)); 1116 throw new Exception(String.Format("avatar {0} {1} does not exist", firstname, lastname));
1117 1117
1118 if (null != passwd) 1118 if (!String.IsNullOrEmpty(passwd))
1119 { 1119 {
1120 m_log.DebugFormat("[RADMIN]: UpdateUserAccount: updating password for avatar {0} {1}", firstname, lastname);
1120 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(passwd) + ":" + String.Empty); 1121 string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(passwd) + ":" + String.Empty);
1121 userProfile.PasswordHash = md5PasswdHash; 1122 userProfile.PasswordHash = md5PasswdHash;
1122 } 1123 }