Author: mattm
Date: 2016-09-22 10:14:02 +0200 (Thu, 22 Sep 2016)
New Revision: 26256
Modified:
trunk/gsa/CMakeLists.txt
trunk/gsa/ChangeLog
trunk/gsa/src/CMakeLists.txt
Log:
* CMakeLists.txt: Add OPENVAS_RUN_DIR.
* src/CMakeLists.txt: Add OPENVAS_RUN_DIR.
Modified: trunk/gsa/CMakeLists.txt
===================================================================
--- trunk/gsa/CMakeLists.txt 2016-09-21 15:37:46 UTC (rev 26255)
+++ trunk/gsa/CMakeLists.txt 2016-09-22 08:14:02 UTC (rev 26256)
@@ -227,6 +227,7 @@
set (OPENVAS_STATE_DIR "${LOCALSTATEDIR}/lib/openvas")
set (OPENVAS_LOG_DIR "${LOCALSTATEDIR}/log/openvas")
+set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run")
set (GSA_DATA_DIR "${DATADIR}/openvas/gsa")
set (GSA_LOCALE_DIR "${DATADIR}/locale")
Modified: trunk/gsa/ChangeLog
===================================================================
--- trunk/gsa/ChangeLog 2016-09-21 15:37:46 UTC (rev 26255)
+++ trunk/gsa/ChangeLog 2016-09-22 08:14:02 UTC (rev 26256)
@@ -1,3 +1,9 @@
+2016-09-22 Matthew Mundell <matthew.mund...@greenbone.net>
+
+ * CMakeLists.txt: Add OPENVAS_RUN_DIR.
+
+ * src/CMakeLists.txt: Add OPENVAS_RUN_DIR.
+
2016-09-21 Timo Pollmeier <timo.pollme...@greenbone.net>
* src/gsad_base.c (login_xml): Add missing comma in first call of
@@ -5,7 +11,7 @@
2016-09-21 Matthew Mundell <matthew.mund...@greenbone.net>
- Sort of UNIX socket default.
+ Sort out UNIX socket default.
* src/gsad_omp.c (omp_init): Prefer the UNIX option to connection to
Manager, and use the OPENVAS_RUN_DIR socket if one is not specified.
Modified: trunk/gsa/src/CMakeLists.txt
===================================================================
--- trunk/gsa/src/CMakeLists.txt 2016-09-21 15:37:46 UTC (rev 26255)
+++ trunk/gsa/src/CMakeLists.txt 2016-09-22 08:14:02 UTC (rev 26256)
@@ -122,6 +122,10 @@
add_definitions (-DOPENVAS_CA_CERTIFICATE=\\\"${OPENVAS_CA_CERTIFICATE}\\\")
endif (OPENVAS_CA_CERTIFICATE)
+if (OPENVAS_RUN_DIR)
+ add_definitions (-DOPENVAS_RUN_DIR=\\\"${OPENVAS_RUN_DIR}\\\")
+endif (OPENVAS_RUN_DIR)
+
if (GSA_DATA_DIR)
add_definitions (-DGSA_DATA_DIR=\\\"${GSA_DATA_DIR}\\\")
endif (GSA_DATA_DIR)
_______________________________________________
Openvas-commits mailing list
Openvas-commits@wald.intevation.org
https://lists.wald.intevation.org/cgi-bin/mailman/listinfo/openvas-commits
