[Openvas-commits] r380 - in trunk/openvas-libraries: . libopenvas

[scm-commit@wald.intevation.org]

Author: jan
Date: 2007-09-13 12:41:22 +0200 (Thu, 13 Sep 2007)
New Revision: 380

Modified:
   trunk/openvas-libraries/ChangeLog
   trunk/openvas-libraries/TODO
   trunk/openvas-libraries/libopenvas/bpf_share.c
   trunk/openvas-libraries/libopenvas/services.h
Log:
* TODO: Removed the entry about separate versioning (it is
done now). Also removed the entry about reviewing the Debian patches
to nessus-libraries (done).

* libopenvas/bpf_share.c, libopenvas/services.h: Fixed paths to
state dir to LSB standard. This make the current Debian patch
to the according Makefile in nessus-libraries unnecessary.



Modified: trunk/openvas-libraries/ChangeLog
===================================================================
--- trunk/openvas-libraries/ChangeLog	2007-09-13 09:24:28 UTC (rev 379)
+++ trunk/openvas-libraries/ChangeLog	2007-09-13 10:41:22 UTC (rev 380)
@@ -1,3 +1,13 @@
+2007-09-13  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* TODO: Removed the entry about separate versioning (it is
+	done now). Also removed the entry about reviewing the Debian patches
+	to nessus-libraries (done).
+
+	* libopenvas/bpf_share.c, libopenvas/services.h: Fixed paths to
+	state dir to LSB standard. This make the current Debian patch
+	to the according Makefile in nessus-libraries unnecessary.
+
 2007-08-03  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
 
 	* configure.in, openvas-libraries.tmpl.in, include/libvers.h.in,

Modified: trunk/openvas-libraries/TODO
===================================================================
--- trunk/openvas-libraries/TODO	2007-09-13 09:24:28 UTC (rev 379)
+++ trunk/openvas-libraries/TODO	2007-09-13 10:41:22 UTC (rev 380)
@@ -19,12 +19,3 @@
 	* AIX: Is this a platform that is really important
 	to be supported? Special treatment for AIX occurs
 	at various places.
-
-	* Review Debian patches for nessus-libraries 2.2.8 and
-	see what should be applied for openvas-libraries.
-
-2007-03-28 <Jan-Oliver.Wagner at intevation.de>
-
-	* Should the versioning be separate from that of -libnasl
-	and -server? Would mean to change NESSUS_MAJOR etc. in configure.in.
-	Anywhere else?

Modified: trunk/openvas-libraries/libopenvas/bpf_share.c
===================================================================
--- trunk/openvas-libraries/libopenvas/bpf_share.c	2007-09-13 09:24:28 UTC (rev 379)
+++ trunk/openvas-libraries/libopenvas/bpf_share.c	2007-09-13 10:41:22 UTC (rev 380)
@@ -26,8 +26,8 @@
 #define NUM_BPF_PER_CLIENT 5
 
 
-#define BPF_SOCKET_PATH NESSUS_STATE_DIR"/nessus/bpf"
-#define BPF_SERVER_PID_FILE NESSUS_STATE_DIR"/nessus/bpf_server.pid"
+#define BPF_SOCKET_PATH NESSUS_STATE_DIR"/lib/openvas/bpf"
+#define BPF_SERVER_PID_FILE NESSUS_STATE_DIR"/lib/openvas/bpf_server.pid"
 
 /*
  * The traditional pcap code is much more handy, so we'll try to use

Modified: trunk/openvas-libraries/libopenvas/services.h
===================================================================
--- trunk/openvas-libraries/libopenvas/services.h	2007-09-13 09:24:28 UTC (rev 379)
+++ trunk/openvas-libraries/libopenvas/services.h	2007-09-13 10:41:22 UTC (rev 380)
@@ -38,10 +38,10 @@
 /* If you want Nessus to use a second input file, uncomment next line */
 /*#define NESSUS_IANA_PORTS	CONF_DIR "/iana-port-numbers"*/
 
-#define NESSUS_SERVICES_TCP	NESSUS_STATE_DIR	"/openvas/services.tcp"
-#define NESSUS_SERVICES_UDP	NESSUS_STATE_DIR	"/openvas/services.udp"
+#define NESSUS_SERVICES_TCP	NESSUS_STATE_DIR	"/lib/openvas/services.tcp"
+#define NESSUS_SERVICES_UDP	NESSUS_STATE_DIR	"/lib/openvas/services.udp"
 /* Not really useful but for debug or information */
-#define NESSUS_SERVICES_TXT	NESSUS_STATE_DIR	"/openvas/services.txt"
+#define NESSUS_SERVICES_TXT	NESSUS_STATE_DIR	"/lib/openvas/services.txt"
 
 #define SERVICES_MAGIC 0x42