2 files changed, 37 insertions, 7 deletions

diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index dcf090e..9af61a9 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -32,6 +32,7 @@ using Nini.Config;
 using System.Reflection;
 using OpenSim.Services.Base;
 using OpenSim.Data;
+using OpenSim.Framework;
 
 namespace OpenSim.Services.AuthenticationService
 {
@@ -43,9 +44,9 @@ namespace OpenSim.Services.AuthenticationService
     //
     public class AuthenticationServiceBase : ServiceBase
     {
-//        private static readonly ILog m_log =
-//                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
  
         protected IAuthenticationData m_Database;
 
@@ -100,6 +101,32 @@ namespace OpenSim.Services.AuthenticationService
             return m_Database.CheckToken(principalID, token, 0);
         }
 
+        public virtual bool SetPassword(UUID principalID, string password)
+        {
+            string passwordSalt = Util.Md5Hash(UUID.Random().ToString());
+            string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + passwordSalt);
+
+            AuthenticationData auth = m_Database.Get(principalID);
+            if (auth == null)
+            {
+                auth = new AuthenticationData();
+                auth.PrincipalID = principalID;
+                auth.Data = new System.Collections.Generic.Dictionary<string, object>();
+                auth.Data["accountType"] = "UserAccount";
+                auth.Data["webLoginKey"] = UUID.Zero.ToString();
+            }
+            auth.Data["passwordHash"] = md5PasswdHash;
+            auth.Data["passwordSalt"] = passwordSalt;
+            if (!m_Database.Store(auth))
+            {
+                m_log.DebugFormat("[AUTHENTICATION DB]: Failed to store authentication data");
+                return false;
+            }
+
+            m_log.InfoFormat("[AUTHENTICATION DB]: Set password for principalID {0}", principalID);
+            return true;
+        }
+        
         protected string GetToken(UUID principalID, int lifetime)
         {
             UUID token = UUID.Random();
@@ -109,5 +136,6 @@ namespace OpenSim.Services.AuthenticationService
 
             return String.Empty;
         }
+
     }
 }
diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index d65665a..021dcf3 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -47,9 +47,9 @@ namespace OpenSim.Services.AuthenticationService
     public class PasswordAuthenticationService :
             AuthenticationServiceBase, IAuthenticationService
     {
-//        private static readonly ILog m_log =
-//                LogManager.GetLogger(
-//                MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log =
+        //        LogManager.GetLogger(
+        //        MethodBase.GetCurrentMethod().DeclaringType);
  
         public PasswordAuthenticationService(IConfigSource config) :
                 base(config)
@@ -66,9 +66,11 @@ namespace OpenSim.Services.AuthenticationService
                 return String.Empty;
             }
 
-            string hashed = Util.Md5Hash(Util.Md5Hash(password) + ":" +
+            string hashed = Util.Md5Hash(password + ":" +
                     data.Data["passwordSalt"].ToString());
 
+            //m_log.DebugFormat("[PASS AUTH]: got {0}; hashed = {1}; stored = {2}", password, hashed, data.Data["passwordHash"].ToString());
+
             if (data.Data["passwordHash"].ToString() == hashed)
             {
                 return GetToken(principalID, lifetime);