From 129e61a33a786a6267474f2c7752e652fc91da45 Mon Sep 17 00:00:00 2001
From: walker0643 <>
Date: Sat, 31 Mar 2018 22:48:59 -0400
Subject: [PATCH] server should look for config in the profile() dir rather
 than the personal() dir. removed personal() since it is no longer used.

---
 src/lib/barrier/ServerApp.cpp             |  5 ++---
 src/lib/common/DataDirectories.h          |  4 ----
 src/lib/common/DataDirectories_static.cpp |  1 -
 src/lib/common/unix/DataDirectories.cpp   | 14 +-------------
 src/lib/common/win32/DataDirectories.cpp  | 12 ------------
 5 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/lib/barrier/ServerApp.cpp b/src/lib/barrier/ServerApp.cpp
index c6e31a5d..fb8ae0e4 100644
--- a/src/lib/barrier/ServerApp.cpp
+++ b/src/lib/barrier/ServerApp.cpp
@@ -144,7 +144,7 @@ ServerApp::help()
            << std::endl
            << "If no configuration file pathname is provided then the first of the" << std::endl
            << "following to load successfully sets the configuration:" << std::endl
-           << "  " << PathUtilities::concat(DataDirectories::personal(), SYS_CONFIG_NAME) << std::endl
+           << "  " << PathUtilities::concat(DataDirectories::profile(), SYS_CONFIG_NAME) << std::endl
            << "  " << PathUtilities::concat(DataDirectories::systemconfig(), SYS_CONFIG_NAME) << std::endl;
 
     LOG((CLOG_PRINT "%s", buffer.str().c_str()));
@@ -182,8 +182,7 @@ ServerApp::loadConfig()
 
     // load the default configuration if no explicit file given
     else {
-        // get the user's home directory
-        String path = DataDirectories::personal();
+        String path = DataDirectories::profile();
         if (!path.empty()) {
             // complete path
             path = PathUtilities::concat(path, USR_CONFIG_NAME);
diff --git a/src/lib/common/DataDirectories.h b/src/lib/common/DataDirectories.h
index edc604a6..8ff5402c 100644
--- a/src/lib/common/DataDirectories.h
+++ b/src/lib/common/DataDirectories.h
@@ -5,9 +5,6 @@
 class DataDirectories
 {
 public:
-    static const std::string& personal();
-    static const std::string& personal(const std::string& path);
-
     static const std::string& profile();
     static const std::string& profile(const std::string& path);
 
@@ -21,7 +18,6 @@ private:
     // static class
     DataDirectories() {}
 
-    static std::string _personal;
     static std::string _profile;
     static std::string _global;
     static std::string _systemconfig;
diff --git a/src/lib/common/DataDirectories_static.cpp b/src/lib/common/DataDirectories_static.cpp
index 51ed9c7b..8a2f53e7 100644
--- a/src/lib/common/DataDirectories_static.cpp
+++ b/src/lib/common/DataDirectories_static.cpp
@@ -1,7 +1,6 @@
 #include "DataDirectories.h"
 
 // static member
-std::string DataDirectories::_personal;
 std::string DataDirectories::_profile;
 std::string DataDirectories::_global;
 std::string DataDirectories::_systemconfig;
diff --git a/src/lib/common/unix/DataDirectories.cpp b/src/lib/common/unix/DataDirectories.cpp
index 0dc8234e..57a56a55 100644
--- a/src/lib/common/unix/DataDirectories.cpp
+++ b/src/lib/common/unix/DataDirectories.cpp
@@ -44,22 +44,10 @@ static std::string unix_home()
 
 #endif // HAVE_GETPWUID_R
 
-const std::string& DataDirectories::personal()
-{
-    if (_personal.empty())
-        _personal = unix_home();
-    return _personal;
-}
-const std::string& DataDirectories::personal(const std::string& path)
-{
-    _personal = path;
-    return _personal;
-}
-
 const std::string& DataDirectories::profile()
 {
     if (_profile.empty())
-        _profile = personal() + ProfileSubdir;
+        _profile = unix_home() + ProfileSubdir;
     return _profile;
 }
 const std::string& DataDirectories::profile(const std::string& path)
diff --git a/src/lib/common/win32/DataDirectories.cpp b/src/lib/common/win32/DataDirectories.cpp
index 5fb36a41..6d2c14e2 100644
--- a/src/lib/common/win32/DataDirectories.cpp
+++ b/src/lib/common/win32/DataDirectories.cpp
@@ -23,18 +23,6 @@ std::string known_folder_path(const KNOWNFOLDERID& id)
     return path;
 }
 
-const std::string& DataDirectories::personal()
-{
-    if (_personal.empty())
-        _personal = known_folder_path(FOLDERID_Documents);
-    return _personal;
-}
-const std::string& DataDirectories::personal(const std::string& path)
-{
-    _personal = path;
-    return _personal;
-}
-
 const std::string& DataDirectories::profile()
 {
     if (_profile.empty())