CHANGE: Change GVM_RUN_DIR to GSAD_RUN_DIR, GVMD_RUN_DIR

The new path GSAD_RUN_DIR is specific to gsad and GVMD_RUN_DIR only
has to be shared with gvmd and other modules using GMP via file socket.

(cherry picked from commit 3a27a85)

CMakeLists.txt

@@ -95,14 +95,18 @@ endif (NOT DATADIR)
 set (GSAD_DATA_DIR "${DATADIR}/gvm/gsad")
 set (GSAD_CONFIG_DIR "${SYSCONFDIR}/gvm/")
 
-if (NOT GVM_RUN_DIR)
-  set (GVM_RUN_DIR  "/run/gvm")
-endif (NOT GVM_RUN_DIR)
+if (NOT GSAD_RUN_DIR)
+  set (GSAD_RUN_DIR  "/run/gsad")
+endif (NOT GSAD_RUN_DIR)
 
 if (NOT GSAD_PID_PATH)
-  set (GSAD_PID_PATH     "/run/gsad/gsad.pid")
+  set (GSAD_PID_PATH     "${GSAD_RUN_DIR}/gsad.pid")
 endif (NOT GSAD_PID_PATH)
 
+if (NOT GVMD_RUN_DIR)
+  set (GVMD_RUN_DIR  "/run/gvmd")
+endif (NOT GVMD_RUN_DIR)
+
 if (NOT GSAD_PID_DIR)
   set (GSAD_PID_DIR "${GVM_RUN_DIR}")
 endif (NOT GSAD_PID_DIR)

src/CMakeLists.txt

@@ -125,12 +125,16 @@ if (GVM_CA_CERTIFICATE)
   add_definitions (-DGVM_CA_CERTIFICATE="${GVM_CA_CERTIFICATE}")
 endif (GVM_CA_CERTIFICATE)
 
-if (GVM_RUN_DIR)
-  add_definitions (-DGVM_RUN_DIR="${GVM_RUN_DIR}")
-endif (GVM_RUN_DIR)
+if (GVMD_RUN_DIR)
+  add_definitions (-DGVMD_RUN_DIR="${GVMD_RUN_DIR}")
+endif (GVMD_RUN_DIR)
+
+if (GSAD_RUN_DIR)
+  add_definitions (-DGSAD_RUN_DIR="${GSAD_RUN_DIR}")
+endif (GSAD_RUN_DIR)
 
 if (GSAD_PID_PATH)
-        add_definitions (-DGSAD_PID_PATH="${GSAD_PID_PATH}")
+  add_definitions (-DGSAD_PID_PATH="${GSAD_PID_PATH}")
 endif (GSAD_PID_PATH)
 
 if (GSAD_DATA_DIR)

src/gsad_gmp.c

@@ -284,7 +284,7 @@ gmp_init (const gchar *manager_address_unix, const gchar *manager_address_tls,
     }
   else
     {
-      manager_address = g_build_filename (GVM_RUN_DIR, "gvmd.sock", NULL);
+      manager_address = g_build_filename (GVMD_RUN_DIR, "gvmd.sock", NULL);
       manager_use_tls = 0;
     }
   manager_port = port_manager;