[Openvas-commits] r3113 - in trunk/openvas-client: . libnessus

[scm-commit@wald.intevation.org]

Author: jan
Date: 2009-04-16 17:58:19 +0200 (Thu, 16 Apr 2009)
New Revision: 3113

Modified:
   trunk/openvas-client/ChangeLog
   trunk/openvas-client/libnessus/network.c
Log:
* libnessus/network.c: Removed any code path for NESSUS_CNX_LOCK.
This is not used and not relevant for client anyway.



Modified: trunk/openvas-client/ChangeLog
===================================================================
--- trunk/openvas-client/ChangeLog	2009-04-16 15:53:58 UTC (rev 3112)
+++ trunk/openvas-client/ChangeLog	2009-04-16 15:58:19 UTC (rev 3113)
@@ -1,3 +1,8 @@
+2009-04-16  Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>
+
+	* libnessus/network.c: Removed any code path for NESSUS_CNX_LOCK.
+	This is not used and not relevant for client anyway.
+
 2009-04-15  Michael Wiegand <michael.wiegand at intevation.de>
 
 	First (optional) integration of openvas-libraries in openvas-client. The

Modified: trunk/openvas-client/libnessus/network.c
===================================================================
--- trunk/openvas-client/libnessus/network.c	2009-04-16 15:53:58 UTC (rev 3112)
+++ trunk/openvas-client/libnessus/network.c	2009-04-16 15:58:19 UTC (rev 3113)
@@ -84,23 +84,6 @@
 
 static nessus_connection connections[NESSUS_FD_MAX];
 
-/*
- * Quick & dirty patch to run Nessus from behind a picky firewall (e.g.
- * FW/1 and his 'Rule 0'): Nessus will never open more than 1 connection at
- * a time.
- * Define NESSUS_CNX_LOCK, recompile and install nessus-library, and restart nessusd
- *
- * WARNING: waiting on the lock file may be long, so increase the default
- * script timeout or some scripts may be killed.
- */
-#undef NESSUS_CNX_LOCK
-/*#define NESSUS_CNX_LOCK	"/tmp/NessusCnx"*/
-
-#ifdef NESSUS_CNX_LOCK
-static int	lock_cnt = 0;
-static int	lock_fd = -1;
-#endif
-
 /**
  * NESSUS_STREAM(x) is TRUE if <x> is a Nessus-ified fd
  */
@@ -1104,17 +1087,6 @@
 ExtFunc int
 socket_close (int soc)
 {
-#if defined NESSUS_CNX_LOCK
-  if (lock_cnt > 0)
-    if (-- lock_cnt == 0)
-      {
-	if (flock(lock_fd, LOCK_UN) < 0)
-	  nessus_perror(NESSUS_CNX_LOCK);
-	if (close(lock_fd) < 0)
-	  nessus_perror(NESSUS_CNX_LOCK);
-	lock_fd = -1;
-      }
-#endif  
   return openvas_sock_close(soc);
 }