[Openvas-commits] r11682 - in trunk/openvas-manager: . src

[scm-commit@wald.intevation.org]

Author: hdoreau
Date: 2011-09-25 14:16:57 +0200 (Sun, 25 Sep 2011)
New Revision: 11682

Modified:
   trunk/openvas-manager/CMakeLists.txt
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/CMakeLists.txt
   trunk/openvas-manager/src/manage.c
Log:
* src/manage.c, src/CMakeLists.txt, CMakeLists.txt: Fix	path to the
SCAP data directory.


Modified: trunk/openvas-manager/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/CMakeLists.txt	2011-09-23 14:39:49 UTC (rev 11681)
+++ trunk/openvas-manager/CMakeLists.txt	2011-09-25 12:16:57 UTC (rev 11682)
@@ -153,6 +153,7 @@
 set (OPENVAS_PID_DIR      "${LOCALSTATEDIR}/run")
 set (OPENVAS_SYSCONF_DIR  "${SYSCONFDIR}/openvas")
 set (OPENVAS_SCAP_RES_DIR "${OPENVAS_DATA_DIR}/scap")
+set (OPENVAS_SCAP_DATA_DIR "${OPENVAS_STATE_DIR}/scap-data")
 
 set (OPENVAS_LIB_INSTALL_DIR     "${LIBDIR}")
 set (OPENVAS_HEADER_INSTALL_DIR  "${INCLUDEDIR}")

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2011-09-23 14:39:49 UTC (rev 11681)
+++ trunk/openvas-manager/ChangeLog	2011-09-25 12:16:57 UTC (rev 11682)
@@ -1,3 +1,8 @@
+2011-09-25  Henri Doreau <henri.doreau at greenbone.net>
+
+	* src/manage.c, src/CMakeLists.txt, CMakeLists.txt: Fix	path to the
+	SCAP data directory.
+
 2011-09-23  Henri Doreau <henri.doreau at greenbone.net>
 
 	* src/omp.c (get_info_data_t, get_info_data_reset, command_data_t)

Modified: trunk/openvas-manager/src/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/src/CMakeLists.txt	2011-09-23 14:39:49 UTC (rev 11681)
+++ trunk/openvas-manager/src/CMakeLists.txt	2011-09-25 12:16:57 UTC (rev 11682)
@@ -67,6 +67,7 @@
 add_definitions (-DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
 
 add_definitions (-DSCAP_RES_DIR=\\\"${OPENVAS_SCAP_RES_DIR}\\\")
+add_definitions (-DSCAP_DATA_DIR=\\\"${OPENVAS_SCAP_DATA_DIR}\\\")
 
 if (OPENVAS_USERS_DIR)
   add_definitions (-DOPENVAS_USERS_DIR=\\\"${OPENVAS_USERS_DIR}\\\")

Modified: trunk/openvas-manager/src/manage.c
===================================================================
--- trunk/openvas-manager/src/manage.c	2011-09-23 14:39:49 UTC (rev 11681)
+++ trunk/openvas-manager/src/manage.c	2011-09-25 12:16:57 UTC (rev 11682)
@@ -83,14 +83,14 @@
 /**
  * @brief CPE dictionary location.
  */
-#define CPE_DICT_FILENAME SCAP_RES_DIR "/official-cpe-dictionary_v2.2.xml"
+#define CPE_DICT_FILENAME SCAP_DATA_DIR "/official-cpe-dictionary_v2.2.xml"
 
 /**
  * @brief CVE data files location format string.
  *
  * %d should be the year expressed as YYYY.
  */
-#define CVE_FILENAME_FMT SCAP_RES_DIR "/nvdcve-2.0-%d.xml"
+#define CVE_FILENAME_FMT SCAP_DATA_DIR "/nvdcve-2.0-%d.xml"
 
 
 /**