Fix bug. (#245)

* Fix bug. Signed-off-by: RileyW <wrllrwwrllrw@gmail.com> * Fix bug. Signed-off-by: RileyW <wrllrwwrllrw@gmail.com> * Format. Signed-off-by: RileyW <wrllrwwrllrw@gmail.com> --------- Signed-off-by: RileyW <wrllrwwrllrw@gmail.com>
PKUHPC · Mar 26, 2024 · e8008d9 · e8008d9
1 parent ea356f8
commit e8008d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/CraneCtld/CraneCtld.cpp b/src/CraneCtld/CraneCtld.cpp
@@ -59,12 +59,13 @@ void ParseConfig(int argc, char** argv) {
       YAML::Node config = YAML::LoadFile(config_path);
 
       if (config["CraneBaseDir"])
-        g_config.CraneBaseDir = config["CranedBaseDir"].as<std::string>();
+        g_config.CraneBaseDir = config["CraneBaseDir"].as<std::string>();
       else
         g_config.CraneBaseDir = kDefaultCraneBaseDir;
 
       if (config["CraneCtldLogFile"])
         g_config.CraneCtldLogFile =
+            g_config.CraneBaseDir +
             config["CraneCtldLogFile"].as<std::string>();
       else
         g_config.CraneCtldLogFile =
@@ -97,13 +98,15 @@ void ParseConfig(int argc, char** argv) {
 
       if (config["CraneCtldMutexFilePath"])
         g_config.CraneCtldMutexFilePath =
+            g_config.CraneBaseDir +
             config["CranedMutexFilePath"].as<std::string>();
       else
         g_config.CraneCtldMutexFilePath =
             g_config.CraneBaseDir + kDefaultCraneCtldMutexFile;
 
       if (config["CraneCtldDbPath"] && !config["CraneCtldDbPath"].IsNull())
-        g_config.CraneCtldDbPath = config["CraneCtldDbPath"].as<std::string>();
+        g_config.CraneCtldDbPath =
+            g_config.CraneBaseDir + config["CraneCtldDbPath"].as<std::string>();
       else
         g_config.CraneCtldDbPath = g_config.CraneBaseDir + kDefaultDbPath;
 

diff --git a/src/Craned/Craned.cpp b/src/Craned/Craned.cpp
@@ -77,7 +77,8 @@ void ParseConfig(int argc, char** argv) {
         g_config.CraneBaseDir = kDefaultCraneBaseDir;
 
       if (config["CranedLogFile"])
-        g_config.CranedLogFile = config["CranedLogFile"].as<std::string>();
+        g_config.CranedLogFile =
+            g_config.CraneBaseDir + config["CranedLogFile"].as<std::string>();
       else
         g_config.CranedLogFile = g_config.CraneBaseDir + kCranedDefaultLogPath;
 
@@ -108,19 +109,22 @@ void ParseConfig(int argc, char** argv) {
 
       if (config["CranedUnixSockPath"])
         g_config.CranedUnixSockPath =
+            g_config.CraneBaseDir +
             config["CranedUnixSockPath"].as<std::string>();
       else
         g_config.CranedUnixSockPath =
             g_config.CraneBaseDir + kDefaultCranedUnixSockPath;
 
       if (config["CranedScriptDir"])
-        g_config.CranedScriptDir = config["CranedScriptDir"].as<std::string>();
+        g_config.CranedScriptDir =
+            g_config.CraneBaseDir + config["CranedScriptDir"].as<std::string>();
       else
         g_config.CranedScriptDir =
             g_config.CraneBaseDir + kDefaultCranedScriptDir;
 
       if (config["CranedMutexFilePath"])
         g_config.CranedMutexFilePath =
+            g_config.CraneBaseDir +
             config["CranedMutexFilePath"].as<std::string>();
       else
         g_config.CranedMutexFilePath =

diff --git a/src/Misc/Pam/PamUtil.cpp b/src/Misc/Pam/PamUtil.cpp
@@ -48,13 +48,13 @@ void LoadCraneConfig(pam_handle_t *pamh, int argc, const char **argv,
     YAML::Node config = YAML::LoadFile(g_pam_config.CraneConfigFilePath);
 
     if (config["CraneBaseDir"])
-      g_pam_config.CraneBaseDir =
-          config["CranedUnixSockPath"].as<std::string>();
+      g_pam_config.CraneBaseDir = config["CraneBaseDir"].as<std::string>();
     else
       g_pam_config.CraneBaseDir = kDefaultCraneBaseDir;
 
     if (config["CranedUnixSockPath"])
       g_pam_config.CranedUnixSockPath =
+          g_pam_config.CraneBaseDir +
           config["CranedUnixSockPath"].as<std::string>();
     else
       g_pam_config.CranedUnixSockPath =