From 036d4cb71ac1abe1990c936ee1f3b2cbf15d14c1 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Thu, 29 Jul 2021 13:04:55 +0200
Subject: secmod: services create their own client dirs with correct
 permissions

---
 src/util/crypto_helper_denom.c | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/util/crypto_helper_denom.c')

diff --git a/src/util/crypto_helper_denom.c b/src/util/crypto_helper_denom.c
index bd9802d2..2cc140c8 100644
--- a/src/util/crypto_helper_denom.c
+++ b/src/util/crypto_helper_denom.c
@@ -228,29 +228,32 @@ TALER_CRYPTO_helper_denom_connect (
 
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                 "PATHS",
-                                                 "TALER_RUNTIME_DIR",
+                                                 "taler-exchange-secmod-rsa",
+                                                 "CLIENT_DIR",
                                                  &tmpdir))
     {
-      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_WARNING,
-                                 "PATHS",
-                                 "TALER_RUNTIME_DIR");
-      tmpdir = GNUNET_strdup ("/tmp");
+      GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
+                                 "taler-exchange-secmod-rsa",
+                                 "CLIENT_DIR");
+      return NULL;
     }
     GNUNET_asprintf (&template,
-                     "%s/crypto-rsa-client/cli",
+                     "%s/cli",
                      tmpdir);
-    GNUNET_free (tmpdir);
+    /* We expect the service to create the client directory */
     if (GNUNET_OK !=
-        GNUNET_DISK_directory_create_for_file (template))
+        GNUNET_DISK_directory_test (tmpdir,
+                                    GNUNET_YES))
     {
-      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
-                                "mkdir",
-                                template);
+      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                  "Unable to read secmod client directory (%s)\n",
+                  tmpdir);
       GNUNET_free (dh);
       GNUNET_free (template);
+      GNUNET_free (tmpdir);
       return NULL;
     }
+    GNUNET_free (tmpdir);
     dh->template = template;
     if (strlen (template) >= sizeof (dh->sa.sun_path))
     {
-- 
cgit v1.2.3