auth stuff is now saved only when modified

diff --git a/src/auth.cpp b/src/auth.cpp
index 49985e6978950b3c87c3dc188993426794f65d73..5d61243c693e357e279da5d6ee6f06d7160a0960 100644 (file)
--- a/src/auth.cpp
+++ b/src/auth.cpp
@@ -77,7 +77,8 @@ u64 stringToPrivs(std::string str)
 }
 
 AuthManager::AuthManager(const std::string &authfilepath):
-               m_authfilepath(authfilepath)
+               m_authfilepath(authfilepath),
+               m_modified(false)
 {
        m_mutex.Init();
        
@@ -138,6 +139,8 @@ void AuthManager::load()
                ad.privs = privs;
                m_authdata[name] = ad;
        }
+
+       m_modified = false;
 }
 
 void AuthManager::save()
@@ -162,6 +165,8 @@ void AuthManager::save()
                AuthData ad = i.getNode()->getValue();
                os<<name<<":"<<ad.pwd<<":"<<privsToString(ad.privs)<<"\n";
        }
+
+       m_modified = false;
 }
 
 bool AuthManager::exists(const std::string &username)
@@ -180,6 +185,8 @@ void AuthManager::set(const std::string &username, AuthData ad)
        JMutexAutoLock lock(m_mutex);
        
        m_authdata[username] = ad;
+
+       m_modified = true;
 }
 
 void AuthManager::add(const std::string &username)
@@ -187,6 +194,8 @@ void AuthManager::add(const std::string &username)
        JMutexAutoLock lock(m_mutex);
        
        m_authdata[username] = AuthData();
+
+       m_modified = true;
 }
 
 std::string AuthManager::getPassword(const std::string &username)
@@ -214,6 +223,8 @@ void AuthManager::setPassword(const std::string &username,
        AuthData ad = n->getValue();
        ad.pwd = password;
        n->setValue(ad);
+
+       m_modified = true;
 }
 
 u64 AuthManager::getPrivs(const std::string &username)
@@ -240,5 +251,14 @@ void AuthManager::setPrivs(const std::string &username, u64 privs)
        AuthData ad = n->getValue();
        ad.privs = privs;
        n->setValue(ad);
+
+       m_modified = true;
 }
 
+bool AuthManager::isModified()
+{
+       JMutexAutoLock lock(m_mutex);
+       return m_modified;
+}
+
+

diff --git a/src/auth.h b/src/auth.h
index 472409d46391a626250daf479f157ff69399a4c3..62dced2a38e0f6b6e481b3cfdaa41c2d7a399eb4 100644 (file)
--- a/src/auth.h
+++ b/src/auth.h
@@ -89,10 +89,12 @@ public:
                        const std::string &password);
        u64 getPrivs(const std::string &username);
        void setPrivs(const std::string &username, u64 privs);
+       bool isModified();
 private:
        JMutex m_mutex;
        std::string m_authfilepath;
        core::map<std::string, AuthData> m_authdata;
+       bool m_modified;
 };
 
 #endif

diff --git a/src/server.cpp b/src/server.cpp
index 9bcac5a6437bb09d21605dc487a45025b332a3c7..e668db0c39a2fb2ee50ada456f690b83df9e7c82 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1728,7 +1728,8 @@ void Server::AsyncRunStep()
                        ScopeProfiler sp(&g_profiler, "Server: saving stuff");
 
                        // Auth stuff
-                       m_authmanager.save();
+                       if(m_authmanager.isModified())
+                               m_authmanager.save();
                        
                        // Map
                        JMutexAutoLock lock(m_env_mutex);