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

[scm-commit@wald.intevation.org]

Author: mattm
Date: 2009-10-05 12:31:15 +0200 (Mon, 05 Oct 2009)
New Revision: 5371

Modified:
   trunk/openvas-manager/ChangeLog
   trunk/openvas-manager/src/ompd.c
Log:
	* src/ompd.c (recreate_session): Add openvas_server_free to fnctl fail.
	(serve_omp): Put the credential args the right way round.

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-10-05 10:27:24 UTC (rev 5370)
+++ trunk/openvas-manager/ChangeLog	2009-10-05 10:31:15 UTC (rev 5371)
@@ -1,5 +1,10 @@
-2009-09-30  Matthew Mundell <matthew.mundell at intevation.de>
+2009-10-05  Matthew Mundell <matthew.mundell at intevation.de>
 
+	* src/ompd.c (recreate_session): Add openvas_server_free to fnctl fail.
+	(serve_omp): Put the credential args the right way round.
+
+2009-10-03  Matthew Mundell <matthew.mundell at intevation.de>
+
 	When parsing the OTP PREFERENCES, read in all the preferences before
 	enabling them, otherwise OMP GET_PREFERENCES might return a partial
 	set of preferences.

Modified: trunk/openvas-manager/src/ompd.c
===================================================================
--- trunk/openvas-manager/src/ompd.c	2009-10-05 10:27:24 UTC (rev 5370)
+++ trunk/openvas-manager/src/ompd.c	2009-10-05 10:31:15 UTC (rev 5371)
@@ -449,6 +449,9 @@
       g_warning ("%s: failed to set scanner socket flag: %s\n",
                  __FUNCTION__,
                  strerror (errno));
+      openvas_server_free (server_socket,
+                           *server_session,
+                           *server_credentials);
       return -1;
     }
   return server_socket;
@@ -490,8 +493,8 @@
 int
 serve_omp (gnutls_session_t* client_session,
            gnutls_session_t* scanner_session,
+           gnutls_certificate_credentials_t* client_credentials,
            gnutls_certificate_credentials_t* scanner_credentials,
-           gnutls_certificate_credentials_t* client_credentials,
            int client_socket, int* scanner_socket_addr)
 {
   int nfds, ret;