Respect SYSTEMTAP_DIR when looking for nss certificate databases.

1 files changed, 8 insertions, 8 deletions

diff --git a/main.cxx b/main.cxx
index 41dcb640..73955f24 100644
--- a/main.cxx
+++ b/main.cxx
@@ -415,14 +415,6 @@ main (int argc, char * const argv [])
   else
     s.cert_db_path = getenv("HOME") + string ("/.systemtap/ssl/server");
 
-  // Location of our signing certificate.
-  // If we're root, use the database in SYSCONFDIR, otherwise
-  // use the one in our $HOME directory.  */
-  if (geteuid() == 0)
-    s.cert_db_path = SYSCONFDIR "/systemtap/ssl/server";
-  else
-    s.cert_db_path = getenv("HOME") + string ("/.systemtap/ssl/server");
-
   const char* s_p = getenv ("SYSTEMTAP_TAPSET");
   if (s_p != NULL)
   {
@@ -468,6 +460,14 @@ main (int argc, char * const argv [])
 	}
     }
 
+  // Location of our signing certificate.
+  // If we're root, use the database in SYSCONFDIR, otherwise
+  // use the one in s.data_path.  */
+  if (geteuid() == 0)
+    s.cert_db_path = SYSCONFDIR "/systemtap/ssl/server";
+  else
+    s.cert_db_path = s.data_path + "/ssl/server";
+
   const char* s_tc = getenv ("SYSTEMTAP_COVERAGE");
   if (s_tc != NULL)
     s.tapset_compile_coverage = true;